Issue#2238: some syntax errors from *args or **kwargs expressions

would give bogus error messages, because of untested exceptions::

    >>> f(**g(1=2))
    XXX undetected error
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
    TypeError: 'int' object is not iterable

instead of the expected SyntaxError: keyword can't be an expression

Will backport.
This commit is contained in:
Amaury Forgeot d'Arc 2008-03-05 01:50:33 +00:00
parent 3710a13506
commit d21fb4c2e0
3 changed files with 14 additions and 0 deletions

View File

@ -282,6 +282,10 @@ class GrammarTests(unittest.TestCase):
def d32v((x,)): pass
d32v((1,))
# Check ast errors in *args and *kwargs
check_syntax_error(self, "f(*g(1=2))")
check_syntax_error(self, "f(**g(1=2))")
def testLambdef(self):
### lambdef: 'lambda' [varargslist] ':' test
l1 = lambda : 0

View File

@ -9,6 +9,12 @@ What's New in Python 2.6 alpha 2?
*Release date: XX-XXX-2008*
Core and builtins
-----------------
- Issue #2238: Some syntax errors in *args and **kwargs expressions could give
bogus error messages.
What's New in Python 2.6 alpha 1?
=================================

View File

@ -1934,10 +1934,14 @@ ast_for_call(struct compiling *c, const node *n, expr_ty func)
}
else if (TYPE(ch) == STAR) {
vararg = ast_for_expr(c, CHILD(n, i+1));
if (!vararg)
return NULL;
i++;
}
else if (TYPE(ch) == DOUBLESTAR) {
kwarg = ast_for_expr(c, CHILD(n, i+1));
if (!kwarg)
return NULL;
i++;
}
}