Merge pull request #623 from abonie/fix_unpacking_function_arguments

Fix unpacking function arguments
beeware · Aug 12, 2017 · 0105f45 · 0105f45
2 parents c7eb157 + 2b1c12f
commit 0105f45
Show file tree

Hide file tree

Showing 4 changed files with 115 additions and 84 deletions.
diff --git a/batavia/VirtualMachine.js b/batavia/VirtualMachine.js
@@ -1838,11 +1838,15 @@ VirtualMachine.prototype.call_function = function(arg, args, kwargs) {
         namedargs[items[0]] = items[1]
     }
     if (kwargs) {
-        namedargs.update(kwargs)
+        for (let kv of kwargs.items()) {
+            namedargs[kv[0]] = kv[1]
+        }
     }
     var posargs = this.popn(lenPos)
     if (args) {
-        posargs = posargs.concat(args)
+        for (let elem of args) {
+            posargs.push(elem)
+        }
     }
 
     var func = this.pop()