Skip to content

Commit 30ed93b

Browse files
authored
bpo-43797: Handle correctly invalid assignments inside function calls and generators (GH-25390)
1 parent fd79af7 commit 30ed93b

File tree

4 files changed

+21
-9
lines changed

4 files changed

+21
-9
lines changed

Grammar/python.gram

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ group[expr_ty]:
638638
| '(' a=(yield_expr | named_expression) ')' { a }
639639
| invalid_group
640640
genexp[expr_ty]:
641-
| '(' a=named_expression b=for_if_clauses ')' { _PyAST_GeneratorExp(a, b, EXTRA) }
641+
| '(' a=direct_named_expression b=for_if_clauses ')' { _PyAST_GeneratorExp(a, b, EXTRA) }
642642
| invalid_comprehension
643643
set[expr_ty]: '{' a=star_named_expressions '}' { _PyAST_Set(a, EXTRA) }
644644
setcomp[expr_ty]:

Lib/test/test_genexps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
>>> dict(a = i for i in range(10))
104104
Traceback (most recent call last):
105105
...
106-
SyntaxError: invalid syntax. Maybe you meant '==' or ':=' instead of '='?
106+
SyntaxError: invalid syntax
107107
108108
Verify that parenthesis are required when used as a keyword argument value
109109

Lib/test/test_syntax.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,6 +868,18 @@
868868
Traceback (most recent call last):
869869
SyntaxError: invalid syntax
870870
871+
>>> dict(x=34); x $ y
872+
Traceback (most recent call last):
873+
SyntaxError: invalid syntax
874+
875+
>>> dict(x=34, (x for x in range 10), 1); x $ y
876+
Traceback (most recent call last):
877+
SyntaxError: invalid syntax
878+
879+
>>> dict(x=34, x=1, y=2); x $ y
880+
Traceback (most recent call last):
881+
SyntaxError: invalid syntax
882+
871883
Make sure that the old "raise X, Y[, Z]" form is gone:
872884
>>> raise X, Y
873885
Traceback (most recent call last):
@@ -1013,7 +1025,7 @@ def _check_error(self, code, errtext,
10131025
def test_expression_with_assignment(self):
10141026
self._check_error(
10151027
"print(end1 + end2 = ' ')",
1016-
"cannot assign to expression here. Maybe you meant '==' instead of '='?",
1028+
'expression cannot contain assignment, perhaps you meant "=="?',
10171029
offset=19
10181030
)
10191031

Parser/parser.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14015,7 +14015,7 @@ group_rule(Parser *p)
1401514015
return _res;
1401614016
}
1401714017

14018-
// genexp: '(' named_expression for_if_clauses ')' | invalid_comprehension
14018+
// genexp: '(' direct_named_expression for_if_clauses ')' | invalid_comprehension
1401914019
static expr_ty
1402014020
genexp_rule(Parser *p)
1402114021
{
@@ -14035,27 +14035,27 @@ genexp_rule(Parser *p)
1403514035
UNUSED(_start_lineno); // Only used by EXTRA macro
1403614036
int _start_col_offset = p->tokens[_mark]->col_offset;
1403714037
UNUSED(_start_col_offset); // Only used by EXTRA macro
14038-
{ // '(' named_expression for_if_clauses ')'
14038+
{ // '(' direct_named_expression for_if_clauses ')'
1403914039
if (p->error_indicator) {
1404014040
D(p->level--);
1404114041
return NULL;
1404214042
}
14043-
D(fprintf(stderr, "%*c> genexp[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'(' named_expression for_if_clauses ')'"));
14043+
D(fprintf(stderr, "%*c> genexp[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'(' direct_named_expression for_if_clauses ')'"));
1404414044
Token * _literal;
1404514045
Token * _literal_1;
1404614046
expr_ty a;
1404714047
asdl_comprehension_seq* b;
1404814048
if (
1404914049
(_literal = _PyPegen_expect_token(p, 7)) // token='('
1405014050
&&
14051-
(a = named_expression_rule(p)) // named_expression
14051+
(a = direct_named_expression_rule(p)) // direct_named_expression
1405214052
&&
1405314053
(b = for_if_clauses_rule(p)) // for_if_clauses
1405414054
&&
1405514055
(_literal_1 = _PyPegen_expect_token(p, 8)) // token=')'
1405614056
)
1405714057
{
14058-
D(fprintf(stderr, "%*c+ genexp[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'(' named_expression for_if_clauses ')'"));
14058+
D(fprintf(stderr, "%*c+ genexp[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'(' direct_named_expression for_if_clauses ')'"));
1405914059
Token *_token = _PyPegen_get_last_nonnwhitespace_token(p);
1406014060
if (_token == NULL) {
1406114061
D(p->level--);
@@ -14075,7 +14075,7 @@ genexp_rule(Parser *p)
1407514075
}
1407614076
p->mark = _mark;
1407714077
D(fprintf(stderr, "%*c%s genexp[%d-%d]: %s failed!\n", p->level, ' ',
14078-
p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'(' named_expression for_if_clauses ')'"));
14078+
p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'(' direct_named_expression for_if_clauses ')'"));
1407914079
}
1408014080
if (p->call_invalid_rules) { // invalid_comprehension
1408114081
if (p->error_indicator) {

0 commit comments

Comments
 (0)