Fix #1474677, non-keyword argument following keyword.

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 9d3ff02c55cc214758403cca1a7e0648c81e1e4d..dc7a16d1e26330867e79be93b48697f61fff6ad3 100644 (file)
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -309,6 +309,9 @@ class SyntaxTestCase(unittest.TestCase):
                           "unindent does not match .* level",
                           subclass=IndentationError)
 
+    def test_kwargs_last(self):
+        self._check_error("int(base=10, '2')", "non-keyword arg")
+
 def test_main():
     test_support.run_unittest(SyntaxTestCase)
     from test import test_syntax

diff --git a/Python/ast.c b/Python/ast.c
index fafa25310b9dd54613b125b12011087dcfa6a960..96645900552dd644ba2a198ac810d8f9357a550b 100644 (file)
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -1750,6 +1750,11 @@ ast_for_call(struct compiling *c, const node *n, expr_ty func)
        if (TYPE(ch) == argument) {
            expr_ty e;
            if (NCH(ch) == 1) {
+               if (nkeywords) {
+                   ast_error(CHILD(ch, 0),
+                             "non-keyword arg after keyword arg");
+                   return NULL;
+               }
                e = ast_for_expr(c, CHILD(ch, 0));
                 if (!e)
                     return NULL;