summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-07-01 20:03:27 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-07-01 20:03:27 (GMT)
commit07a1f94fb70b99bc6760df57bb51542ed5dac906 (patch)
tree34ca868aaf902375dacdb3f77b32c0cd583de363 /Python
parent13e89463e3cfe2a349307ee09217c17fa7274bad (diff)
downloadcpython-07a1f94fb70b99bc6760df57bb51542ed5dac906.zip
cpython-07a1f94fb70b99bc6760df57bb51542ed5dac906.tar.gz
cpython-07a1f94fb70b99bc6760df57bb51542ed5dac906.tar.bz2
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 ........
Diffstat (limited to 'Python')
-rw-r--r--Python/ast.c10
1 files changed, 9 insertions, 1 deletions
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;