mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 03:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 64622 via svnmerge from

Browse source 
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
........
This commit is contained in:
Benjamin Peterson 2008-07-01 20:03:27 +00:00
parent 13e89463e3
commit 07a1f94fb7
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_syntax.py
View file

@ -470,6 +470,12 @@ Make sure that the old "raise X, Y[, Z]" form is gone:
... ...
SyntaxError: invalid syntax SyntaxError: invalid syntax
>>> f(a=23, a=234)
Traceback (most recent call last):
...
SyntaxError: keyword argument repeated
""" """
import re import re

10
Python/ast.c
View file

@ -1968,7 +1968,8 @@ ast_for_call(struct compiling *c, const node *n, expr_ty func)
} }
else { else {
keyword_ty kw; keyword_ty kw;
identifier key; identifier key, tmp;
int k;
/* CHILD(ch, 0) is test, but must be an identifier? */ /* CHILD(ch, 0) is test, but must be an identifier? */
e = ast_for_expr(c, CHILD(ch, 0)); 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; return NULL;
} }
key = e->v.Name.id; 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)); e = ast_for_expr(c, CHILD(ch, 2));
if (!e) if (!e)
return NULL; return NULL;