deprecated the old header hack used in python_to_pythonjs.py, replaced with a command line option: --module name for when sending input using stdin,

hartsantler · hartsantler · commit baf2eb1b6897 · 2013-11-15T15:08:38.000-08:00
otherwise the module name is the first python file given on the command line.
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -313,7 +313,7 @@ def visit_ImportFrom(self, node):
 			## the helper script (nodejs.py) checks for these import statements, and loads the binding,
 			pass
 		else:
-			raise SyntaxError( 'invalid import' )
+			raise SyntaxError( 'invalid import - could not find cached module: %s' %node.module )
 
 	def visit_Assert(self, node):
 		## hijacking "assert isinstance(a,A)" as a type system ##
@@ -1533,12 +1533,18 @@ def main(script):
 
 
 def command():
-	module = module_path = None
+	module = None
+	module_path = '/tmp'
 	scripts = []
 	if len(sys.argv) > 1:
-		for arg in sys.argv[1:]:
+		argv = sys.argv[1:]
+		for i,arg in enumerate(argv):
 			if arg.endswith('.py'):
 				scripts.append( arg )
+				module = arg.split('.')[0]
+			elif module is None and i > 0:
+				if argv[i-1] == '--module':
+					module = arg
 
 	if len(scripts):
 		a = []
@@ -1548,13 +1554,13 @@ def command():
 	else:
 		data = sys.stdin.read()
 
-	if data.startswith('#!'):
-		header = data[ 2 : data.index('\n') ]
-		data = data[ data.index('\n')+1 : ]
-		if ';' in header:
-			module_path, module = header.split(';')
-		else:
-			module_path = header
+	#if data.startswith('#!'):
+	#	header = data[ 2 : data.index('\n') ]
+	#	data = data[ data.index('\n')+1 : ]
+	#	if ';' in header:
+	#		module_path, module = header.split(';')
+	#	else:
+	#		module_path = header
 
 	compiler = PythonToPythonJS( module=module, module_path=module_path )
 
diff --git a/tests/server.py b/tests/server.py
@@ -31,20 +31,24 @@
 
 
 def python_to_pythonjs( src, module=None, global_variable_scope=False ):
-	cmdheader = '#!%s' %PATHS['module_cache']
-	if module:
-		assert '.' not in module
-		cmdheader += ';' + module
-	cmdheader += '\n'
+	#cmdheader = '#!%s' %PATHS['module_cache']
+	#if module:
+	#	assert '.' not in module
+	#	cmdheader += ';' + module
+	#cmdheader += '\n'
 
 	cmd = ['python2', os.path.join( PATHS['pythonscript'], 'python_to_pythonjs.py')]
 	if global_variable_scope: cmd.append('--global-variable-scope')
+	if module:
+		cmd.append( '--module' )
+		cmd.append( module )
+
 	p = subprocess.Popen(
 		cmd,
 		stdin = subprocess.PIPE,
 		stdout = subprocess.PIPE
 	)
-	stdout, stderr = p.communicate( (cmdheader + src).encode('utf-8') )
+	stdout, stderr = p.communicate( src.encode('utf-8') )
 	return stdout.decode('utf-8')
 
 def pythonjs_to_javascript( src, closure_compiler=False ):
