mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

[3.14] gh-133999: Fix except parsing regression in 3.14 (GH-134035) (#134206)

Browse source 
gh-133999: Fix `except` parsing regression in 3.14 (GH-134035)
(cherry picked from commit 84914ad0e5)

Co-authored-by: sobolevn <mail@sobolevn.me>
This commit is contained in:
Miss Islington (bot) 2025-05-19 13:26:27 +02:00 • committed by GitHub
parent 9136ccfffe
commit d9c08c57e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 43 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Grammar/python.gram
View file

@ -1418,7 +1418,7 @@ invalid_except_stmt:
RAISE_SYNTAX_ERROR_STARTING_FROM(a, "multiple exception types must be parenthesized when using 'as'") } RAISE_SYNTAX_ERROR_STARTING_FROM(a, "multiple exception types must be parenthesized when using 'as'") }
| a='except' expression ['as' NAME ] NEWLINE { RAISE_SYNTAX_ERROR("expected ':'") } | a='except' expression ['as' NAME ] NEWLINE { RAISE_SYNTAX_ERROR("expected ':'") }
| a='except' NEWLINE { RAISE_SYNTAX_ERROR("expected ':'") } | a='except' NEWLINE { RAISE_SYNTAX_ERROR("expected ':'") }
| 'except' expression 'as' a=expression { | 'except' expression 'as' a=expression ':' block {
RAISE_SYNTAX_ERROR_KNOWN_LOCATION( RAISE_SYNTAX_ERROR_KNOWN_LOCATION(
a, "cannot use except statement with %s", _PyPegen_get_expr_name(a)) } a, "cannot use except statement with %s", _PyPegen_get_expr_name(a)) }
invalid_except_star_stmt: invalid_except_star_stmt:
@ -1426,7 +1426,7 @@ invalid_except_star_stmt:
RAISE_SYNTAX_ERROR_STARTING_FROM(a, "multiple exception types must be parenthesized when using 'as'") } RAISE_SYNTAX_ERROR_STARTING_FROM(a, "multiple exception types must be parenthesized when using 'as'") }
| a='except' '*' expression ['as' NAME ] NEWLINE { RAISE_SYNTAX_ERROR("expected ':'") } | a='except' '*' expression ['as' NAME ] NEWLINE { RAISE_SYNTAX_ERROR("expected ':'") }
| a='except' '*' (NEWLINE | ':') { RAISE_SYNTAX_ERROR("expected one or more exception types") } | a='except' '*' (NEWLINE | ':') { RAISE_SYNTAX_ERROR("expected one or more exception types") }
| 'except' '*' expression 'as' a=expression { | 'except' '*' expression 'as' a=expression ':' block {
RAISE_SYNTAX_ERROR_KNOWN_LOCATION( RAISE_SYNTAX_ERROR_KNOWN_LOCATION(
a, "cannot use except* statement with %s", _PyPegen_get_expr_name(a)) } a, "cannot use except* statement with %s", _PyPegen_get_expr_name(a)) }
invalid_finally_stmt: invalid_finally_stmt:

17
Lib/test/test_syntax.py
View file

@ -1431,6 +1431,23 @@ Better error message for using `except as` with not a name:
Traceback (most recent call last): Traceback (most recent call last):
SyntaxError: cannot use except* statement with literal SyntaxError: cannot use except* statement with literal
Regression tests for gh-133999:
>>> try: pass
... except TypeError as name: raise from None
Traceback (most recent call last):
SyntaxError: invalid syntax
>>> try: pass
... except* TypeError as name: raise from None
Traceback (most recent call last):
SyntaxError: invalid syntax
>>> match 1:
... case 1 | 2 as abc: raise from None
Traceback (most recent call last):
SyntaxError: invalid syntax
Ensure that early = are not matched by the parser as invalid comparisons Ensure that early = are not matched by the parser as invalid comparisons
>>> f(2, 4, x=34); 1 $ 2 >>> f(2, 4, x=34); 1 $ 2
Traceback (most recent call last): Traceback (most recent call last):

2
Misc/NEWS.d/next/Core_and_Builtins/2025-05-15-11-38-16.gh-issue-133999.uBZ8uS.rst Normal file
View file

@ -0,0 +1,2 @@
Fix :exc:`SyntaxError` regression in :keyword:`except` parsing after
:gh:`123440`.

32
Parser/parser.c generated
View file

@ -24202,7 +24202,7 @@ invalid_try_stmt_rule(Parser *p)
// | 'except' expression ',' expressions 'as' NAME ':' // | 'except' expression ',' expressions 'as' NAME ':'
// | 'except' expression ['as' NAME] NEWLINE // | 'except' expression ['as' NAME] NEWLINE
// | 'except' NEWLINE // | 'except' NEWLINE
// | 'except' expression 'as' expression // | 'except' expression 'as' expression ':' block
static void * static void *
invalid_except_stmt_rule(Parser *p) invalid_except_stmt_rule(Parser *p)
{ {
@ -24318,15 +24318,17 @@ invalid_except_stmt_rule(Parser *p)
D(fprintf(stderr, "%*c%s invalid_except_stmt[%d-%d]: %s failed!\n", p->level, ' ', D(fprintf(stderr, "%*c%s invalid_except_stmt[%d-%d]: %s failed!\n", p->level, ' ',
p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'except' NEWLINE")); p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'except' NEWLINE"));
} }
{ // 'except' expression 'as' expression { // 'except' expression 'as' expression ':' block
if (p->error_indicator) { if (p->error_indicator) {
p->level--; p->level--;
return NULL; return NULL;
} }
D(fprintf(stderr, "%*c> invalid_except_stmt[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'except' expression 'as' expression")); D(fprintf(stderr, "%*c> invalid_except_stmt[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'except' expression 'as' expression ':' block"));
Token * _keyword; Token * _keyword;
Token * _keyword_1; Token * _keyword_1;
Token * _literal;
expr_ty a; expr_ty a;
asdl_stmt_seq* block_var;
expr_ty expression_var; expr_ty expression_var;
if ( if (
(_keyword = _PyPegen_expect_token(p, 677)) // token='except' (_keyword = _PyPegen_expect_token(p, 677)) // token='except'
@ -24336,9 +24338,13 @@ invalid_except_stmt_rule(Parser *p)
(_keyword_1 = _PyPegen_expect_token(p, 680)) // token='as' (_keyword_1 = _PyPegen_expect_token(p, 680)) // token='as'
&& &&
(a = expression_rule(p)) // expression (a = expression_rule(p)) // expression
&&
(_literal = _PyPegen_expect_token(p, 11)) // token=':'
&&
(block_var = block_rule(p)) // block
) )
{ {
D(fprintf(stderr, "%*c+ invalid_except_stmt[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'except' expression 'as' expression")); D(fprintf(stderr, "%*c+ invalid_except_stmt[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'except' expression 'as' expression ':' block"));
_res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "cannot use except statement with %s" , _PyPegen_get_expr_name ( a ) ); _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "cannot use except statement with %s" , _PyPegen_get_expr_name ( a ) );
if (_res == NULL && PyErr_Occurred()) { if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1; p->error_indicator = 1;
@ -24349,7 +24355,7 @@ invalid_except_stmt_rule(Parser *p)
} }
p->mark = _mark; p->mark = _mark;
D(fprintf(stderr, "%*c%s invalid_except_stmt[%d-%d]: %s failed!\n", p->level, ' ', D(fprintf(stderr, "%*c%s invalid_except_stmt[%d-%d]: %s failed!\n", p->level, ' ',
p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'except' expression 'as' expression")); p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'except' expression 'as' expression ':' block"));
} }
_res = NULL; _res = NULL;
done: done:
@ -24361,7 +24367,7 @@ invalid_except_stmt_rule(Parser *p)
// | 'except' '*' expression ',' expressions 'as' NAME ':' // | 'except' '*' expression ',' expressions 'as' NAME ':'
// | 'except' '*' expression ['as' NAME] NEWLINE // | 'except' '*' expression ['as' NAME] NEWLINE
// | 'except' '*' (NEWLINE | ':') // | 'except' '*' (NEWLINE | ':')
// | 'except' '*' expression 'as' expression // | 'except' '*' expression 'as' expression ':' block
static void * static void *
invalid_except_star_stmt_rule(Parser *p) invalid_except_star_stmt_rule(Parser *p)
{ {
@ -24486,16 +24492,18 @@ invalid_except_star_stmt_rule(Parser *p)
D(fprintf(stderr, "%*c%s invalid_except_star_stmt[%d-%d]: %s failed!\n", p->level, ' ', D(fprintf(stderr, "%*c%s invalid_except_star_stmt[%d-%d]: %s failed!\n", p->level, ' ',
p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'except' '*' (NEWLINE | ':')")); p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'except' '*' (NEWLINE | ':')"));
} }
{ // 'except' '*' expression 'as' expression { // 'except' '*' expression 'as' expression ':' block
if (p->error_indicator) { if (p->error_indicator) {
p->level--; p->level--;
return NULL; return NULL;
} }
D(fprintf(stderr, "%*c> invalid_except_star_stmt[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'except' '*' expression 'as' expression")); D(fprintf(stderr, "%*c> invalid_except_star_stmt[%d-%d]: %s\n", p->level, ' ', _mark, p->mark, "'except' '*' expression 'as' expression ':' block"));
Token * _keyword; Token * _keyword;
Token * _keyword_1; Token * _keyword_1;
Token * _literal; Token * _literal;
Token * _literal_1;
expr_ty a; expr_ty a;
asdl_stmt_seq* block_var;
expr_ty expression_var; expr_ty expression_var;
if ( if (
(_keyword = _PyPegen_expect_token(p, 677)) // token='except' (_keyword = _PyPegen_expect_token(p, 677)) // token='except'
@ -24507,9 +24515,13 @@ invalid_except_star_stmt_rule(Parser *p)
(_keyword_1 = _PyPegen_expect_token(p, 680)) // token='as' (_keyword_1 = _PyPegen_expect_token(p, 680)) // token='as'
&& &&
(a = expression_rule(p)) // expression (a = expression_rule(p)) // expression
&&
(_literal_1 = _PyPegen_expect_token(p, 11)) // token=':'
&&
(block_var = block_rule(p)) // block
) )
{ {
D(fprintf(stderr, "%*c+ invalid_except_star_stmt[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'except' '*' expression 'as' expression")); D(fprintf(stderr, "%*c+ invalid_except_star_stmt[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'except' '*' expression 'as' expression ':' block"));
_res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "cannot use except* statement with %s" , _PyPegen_get_expr_name ( a ) ); _res = RAISE_SYNTAX_ERROR_KNOWN_LOCATION ( a , "cannot use except* statement with %s" , _PyPegen_get_expr_name ( a ) );
if (_res == NULL && PyErr_Occurred()) { if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1; p->error_indicator = 1;
@ -24520,7 +24532,7 @@ invalid_except_star_stmt_rule(Parser *p)
} }
p->mark = _mark; p->mark = _mark;
D(fprintf(stderr, "%*c%s invalid_except_star_stmt[%d-%d]: %s failed!\n", p->level, ' ', D(fprintf(stderr, "%*c%s invalid_except_star_stmt[%d-%d]: %s failed!\n", p->level, ' ',
p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'except' '*' expression 'as' expression")); p->error_indicator ? "ERROR!" : "-", _mark, p->mark, "'except' '*' expression 'as' expression ':' block"));
} }
_res = NULL; _res = NULL;
done: done: