Fix ordering of starred, kwargs in calls for python 2 (#102)

* Add broken mixed call test for #101

* Fix starred args and kwargs ordering in calls for python 2

Author: ryanashcraft

src/printer/index.js

@@ -639,19 +639,21 @@ function genericPrint(path, options, print) {
     case "Call": {
       let args = [];
 
-      // python 2
+      args = args.concat(path.map(print, "args"));
+
+      // `starargs` and `kwargs` were removed in Python 3.5.
+      // Instead starred arguments exist in `args` and `kwargs` in `keywords`.
 
       if (n.starargs) {
         args.push(concat(["*", path.call(print, "starargs")]));
       }
 
+      args = args.concat(path.map(print, "keywords"));
+
       if (n.kwargs) {
         args.push(concat(["**", path.call(print, "kwargs")]));
       }
 
-      args = args.concat(path.map(print, "args"));
-      args = args.concat(path.map(print, "keywords"));
-
       return concat([path.call(print, "func"), "(", join(", ", args), ")"]);
     }
 

tests/python_call_mixed/__snapshots__/jsfmt.spec.js.snap

@@ -0,0 +1,23 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`call_mixed.py 1`] = `
+args = (1, 2, 3, 4)
+kwargs = {'var_f': 7}
+my_func_with_many_args(0, *args, var_e=5, var_j=6, **kwargs)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+args = (1, 2, 3, 4)
+kwargs = {"var_f": 7}
+my_func_with_many_args(0, *args, var_e=5, var_j=6, **kwargs)
+
+`;
+
+exports[`call_mixed.py 2`] = `
+args = (1, 2, 3, 4)
+kwargs = {'var_f': 7}
+my_func_with_many_args(0, *args, var_e=5, var_j=6, **kwargs)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+args = (1, 2, 3, 4)
+kwargs = {"var_f": 7}
+my_func_with_many_args(0, *args, var_e=5, var_j=6, **kwargs)
+
+`;

tests/python_call_mixed/call_mixed.py

@@ -0,0 +1,3 @@
+args = (1, 2, 3, 4)
+kwargs = {'var_f': 7}
+my_func_with_many_args(0, *args, var_e=5, var_j=6, **kwargs)

tests/python_call_mixed/jsfmt.spec.js

@@ -0,0 +1,2 @@
+run_spec(__dirname, ["python"], { pythonVersion: "2" });
+run_spec(__dirname, ["python"], { pythonVersion: "3" });