From 07a1f94fb70b99bc6760df57bb51542ed5dac906 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Tue, 1 Jul 2008 20:03:27 +0000 Subject: Merged revisions 64622 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r64622 | benjamin.peterson | 2008-07-01 14:34:52 -0500 (Tue, 01 Jul 2008) | 1 line #3219 repeated keyword arguments aren't allowed in function calls anymore ........ --- Lib/test/test_syntax.py | 6 ++++++ Python/ast.c | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 11ca4ea..c82787e 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -470,6 +470,12 @@ Make sure that the old "raise X, Y[, Z]" form is gone: ... SyntaxError: invalid syntax + +>>> f(a=23, a=234) +Traceback (most recent call last): + ... +SyntaxError: keyword argument repeated + """ import re diff --git a/Python/ast.c b/Python/ast.c index 79c9403..6ec2ef1 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -1968,7 +1968,8 @@ ast_for_call(struct compiling *c, const node *n, expr_ty func) } else { keyword_ty kw; - identifier key; + identifier key, tmp; + int k; /* CHILD(ch, 0) is test, but must be an identifier? */ e = ast_for_expr(c, CHILD(ch, 0)); @@ -1989,6 +1990,13 @@ ast_for_call(struct compiling *c, const node *n, expr_ty func) return NULL; } key = e->v.Name.id; + for (k = 0; k < nkeywords; k++) { + tmp = ((keyword_ty)asdl_seq_GET(keywords, k))->arg; + if (!PyUnicode_Compare(tmp, key)) { + ast_error(CHILD(ch, 0), "keyword argument repeated"); + return NULL; + } + } e = ast_for_expr(c, CHILD(ch, 2)); if (!e) return NULL; -- cgit v0.12