fixed calling a function that expects kwargs, but the caller passes plain args, do not use kwarg defaults.

hartsantler · hartsantler · commit 54f3256f4dee · 2013-10-07T06:35:36.000-07:00
added server.py --regenerate-runtime
updated runtime
diff --git a/bindings/three.py b/bindings/three.py
@@ -450,4 +450,9 @@ def position(self):
 	@property
 	def rotation(self):
 		vec = self._object.rotation
+		return Vector3( object=vec )
+
+	@property
+	def scale(self):
+		vec = self._object.scale
 		return Vector3( object=vec )
diff --git a/pythonscript.js b/pythonscript.js
@@ -1,4 +1,4 @@
-// PythonScript Runtime - regenerated on: Mon Oct  7 03:32:19 2013
+// PythonScript Runtime - regenerated on: Mon Oct  7 06:29:29 2013
 var jsrange = function(num) {
 "Emulates Python's range function";
 var i, r;
@@ -304,22 +304,34 @@ if(kwarg) {
 out[arg] = kwarg;
 }
 else {
+if(j < args.length) {
+out[arg] = args[j];
+}
+else {
 if(arg  in  signature.kwargs) {
 out[arg] = signature.kwargs[arg];
 }
 else {
-out[arg] = args[j];
+throw TypeError;
+}
+
 }
 
 }
 
+}
+else {
+if(j < args.length) {
+out[arg] = args[j];
 }
 else {
 if(arg  in  signature.kwargs) {
 out[arg] = signature.kwargs[arg];
 }
 else {
-out[arg] = args[j];
+throw TypeError;
+}
+
 }
 
 }
diff --git a/runtime/pythonpythonjs.py b/runtime/pythonpythonjs.py
@@ -205,14 +205,20 @@ def get_arguments(signature, args, kwargs):
             kwarg = kwargs[arg]
             if kwarg:
                 out[arg] = kwarg
+            elif j < args.length:
+                out[arg] = args[j]
             elif arg in signature.kwargs:
                 out[arg] = signature.kwargs[arg]
             else:
-                out[arg] = args[j]
+                #out[arg] = args[j]
+                raise TypeError
+        elif j < args.length:
+            out[arg] = args[j]
         elif arg in signature.kwargs:
             out[arg] = signature.kwargs[arg]
         else:
-            out[arg] = args[j]
+            #out[arg] = args[j]
+            raise TypeError
         j += 1
     args = args.slice(j)
     if signature.vararg:
diff --git a/tests/server.py b/tests/server.py
@@ -13,7 +13,7 @@
 
 import tornado.ioloop
 import tornado.web
-import os, subprocess, datetime
+import os, sys, subprocess, datetime
 
 PATHS = dict(
 	webroot = os.path.dirname(os.path.abspath(__file__)),
@@ -28,7 +28,7 @@
 
 )
 
-REGENERATE_RUNTIME = True  ## to be safer, the runtime should be rebuilt each run
+REGENERATE_RUNTIME = '--regenerate-runtime' in sys.argv
 
 def python_to_pythonjs( src, module=None ):
 	cmdheader = '#!%s' %PATHS['module_cache']
diff --git a/tests/test_calling_args_and_kwargs.html b/tests/test_calling_args_and_kwargs.html
@@ -12,6 +12,9 @@
 	print('testing mixed args and kwargs')
 	print a,b, x,y,z
 
+def test_simple(x,y):
+	print x,y
+
 def test():
 	print('hello world')
 	test_kwargs()
@@ -21,6 +24,11 @@
 	mixed_args_kwargs(9,9)
 	mixed_args_kwargs(9,9, z=420)
 
+	test_kwargs(3, 2, 1)
+
+	test_simple(1,2)
+	test_simple(1)  ## calling with too few args throw a TypeError
+
 </script>
 </head>
 
diff --git a/tests/test_threejs.html b/tests/test_threejs.html
@@ -8,7 +8,7 @@
 from three import *
 
 def test():
-	v = Vector3(1, 2, 3)
+	v = Vector3(1, 2, z=3)
 	print( v.x )
 	print( v.y )
 	print( v.z )

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// PythonScript Runtime - regenerated on: Mon Oct 7 03:32:19 2013`
	`1`	`+// PythonScript Runtime - regenerated on: Mon Oct 7 06:29:29 2013`
`2`	`2`	`var jsrange = function(num) {`
`3`	`3`	`"Emulates Python's range function";`
`4`	`4`	`var i, r;`
`@@ -304,22 +304,34 @@ if(kwarg) {`
`304`	`304`	`out[arg] = kwarg;`
`305`	`305`	`}`
`306`	`306`	`else {`
	`307`	`+if(j < args.length) {`
	`308`	`+out[arg] = args[j];`
	`309`	`+}`
	`310`	`+else {`
`307`	`311`	`if(arg in signature.kwargs) {`
`308`	`312`	`out[arg] = signature.kwargs[arg];`
`309`	`313`	`}`
`310`	`314`	`else {`
`311`		`-out[arg] = args[j];`
	`315`	`+throw TypeError;`
	`316`	`+}`
	`317`	`+`
`312`	`318`	`}`
`313`	`319`
`314`	`320`	`}`
`315`	`321`
	`322`	`+}`
	`323`	`+else {`
	`324`	`+if(j < args.length) {`
	`325`	`+out[arg] = args[j];`
`316`	`326`	`}`
`317`	`327`	`else {`
`318`	`328`	`if(arg in signature.kwargs) {`
`319`	`329`	`out[arg] = signature.kwargs[arg];`
`320`	`330`	`}`
`321`	`331`	`else {`
`322`		`-out[arg] = args[j];`
	`332`	`+throw TypeError;`
	`333`	`+}`
	`334`	`+`
`323`	`335`	`}`
`324`	`336`
`325`	`337`	`}`