#3219 repeated keyword arguments aren't allowed in function calls anymore

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index d0433034db212c307325e334cb7e43f09bea8f89..6e60706ac342dd5a8e85237d966d30deeac2c5bf 100644 (file)
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -417,6 +417,11 @@ leading to spurious errors.
      ...
    SyntaxError: can't assign to function call (<doctest test.test_syntax[48]>, line 6)
 
+>>> f(a=23, a=234)
+Traceback (most recent call last):
+   ...
+SyntaxError: keyword argument repeated (<doctest test.test_syntax[49]>, line 1)
+
 """
 
 import re

diff --git a/Misc/NEWS b/Misc/NEWS
index 1dd586fcb49d5853918af9c481a13768e4a6992f..af95f94affc0b46b280663b0683311b2b2e2c846 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,10 @@ Core and Builtins
   slice(None, 10, -1).indices(10) returns (9, 9, -1) instead of (9,
   10, -1).
 
+- Issue #3219: Calling a function with repeated keyword arguments, f(a=2, a=23),
+  would not cause a syntax error.  This was regression from 2.4 caused by the
+  switch to the new compiler.
+
 Build
 -----
 

diff --git a/Python/ast.c b/Python/ast.c
index 4d874af5c24f54ba9961362144b045904c29a556..dc224781579d39a7f8ae050e6d498bbe923cdc77 100644 (file)
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -1912,6 +1912,8 @@ ast_for_call(struct compiling *c, const node *n, expr_ty func)
             else {
                 keyword_ty kw;
                 identifier key;
+                int k;
+                char *tmp;
 
                 /* CHILD(ch, 0) is test, but must be an identifier? */ 
                 e = ast_for_expr(c, CHILD(ch, 0));
@@ -1933,6 +1935,14 @@ ast_for_call(struct compiling *c, const node *n, expr_ty func)
                 key = e->v.Name.id;
                 if (!forbidden_check(c, CHILD(ch, 0), PyBytes_AS_STRING(key)))
                     return NULL;
+                for (k = 0; k < nkeywords; k++) {
+                    tmp = PyString_AS_STRING(
+                        ((keyword_ty)asdl_seq_GET(keywords, k))->arg);
+                    if (!strcmp(tmp, PyString_AS_STRING(key))) {
+                        ast_error(CHILD(ch, 0), "keyword argument repeated");
+                        return NULL;
+                    }
+                }
                 e = ast_for_expr(c, CHILD(ch, 2));
                 if (!e)
                     return NULL;