diff options
| -rw-r--r-- | Doc/whatsnew/3.10.rst | 2 | ||||
| -rw-r--r-- | Grammar/python.gram | 2 | ||||
| -rw-r--r-- | Lib/test/test_syntax.py | 10 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2021-05-08-17-18-37.bpo-43149.Kp5FxD.rst | 2 | ||||
| -rw-r--r-- | Parser/parser.c | 2 |
5 files changed, 10 insertions, 8 deletions
diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst index cfc560e..2c6569f 100644 --- a/Doc/whatsnew/3.10.rst +++ b/Doc/whatsnew/3.10.rst @@ -248,7 +248,7 @@ have been incorporated. Some of the most notable ones: File "<stdin>", line 3 except NotEnoughScienceError, NotEnoughResourcesError: ^ - SyntaxError: exception group must be parenthesized + SyntaxError: multiple exception types must be parenthesized (Contributed by Pablo Galindo in :issue:`43149`) diff --git a/Grammar/python.gram b/Grammar/python.gram index 2f553c6..6b815ab 100644 --- a/Grammar/python.gram +++ b/Grammar/python.gram @@ -956,7 +956,7 @@ invalid_try_stmt: RAISE_INDENTATION_ERROR("expected an indented block after 'try' statement on line %d", a->lineno) } invalid_except_stmt: | 'except' a=expression ',' expressions ['as' NAME ] ':' { - RAISE_SYNTAX_ERROR_STARTING_FROM(a, "exception group must be parenthesized") } + RAISE_SYNTAX_ERROR_STARTING_FROM(a, "multiple exception types must be parenthesized") } | a='except' expression ['as' NAME ] NEWLINE { RAISE_SYNTAX_ERROR("expected ':'") } | a='except' NEWLINE { RAISE_SYNTAX_ERROR("expected ':'") } invalid_finally_stmt: diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 9799697..5840721 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -1068,7 +1068,7 @@ Make sure that the old "raise X, Y[, Z]" form is gone: ... SyntaxError: invalid syntax -Check that an exception group with missing parentheses +Check that an multiple exception types with missing parentheses raise a custom exception >>> try: @@ -1076,21 +1076,21 @@ raise a custom exception ... except A, B: ... pass Traceback (most recent call last): - SyntaxError: exception group must be parenthesized + SyntaxError: multiple exception types must be parenthesized >>> try: ... pass ... except A, B, C: ... pass Traceback (most recent call last): - SyntaxError: exception group must be parenthesized + SyntaxError: multiple exception types must be parenthesized >>> try: ... pass ... except A, B, C as blech: ... pass Traceback (most recent call last): - SyntaxError: exception group must be parenthesized + SyntaxError: multiple exception types must be parenthesized >>> try: ... pass @@ -1099,7 +1099,7 @@ raise a custom exception ... finally: ... pass Traceback (most recent call last): - SyntaxError: exception group must be parenthesized + SyntaxError: multiple exception types must be parenthesized >>> f(a=23, a=234) diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-05-08-17-18-37.bpo-43149.Kp5FxD.rst b/Misc/NEWS.d/next/Core and Builtins/2021-05-08-17-18-37.bpo-43149.Kp5FxD.rst new file mode 100644 index 0000000..cc1983e --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-05-08-17-18-37.bpo-43149.Kp5FxD.rst @@ -0,0 +1,2 @@ +Corrent the syntax error message regarding multiple exception types to not +refer to "exception groups". Patch by Pablo Galindo diff --git a/Parser/parser.c b/Parser/parser.c index 6958963..2ca628b 100644 --- a/Parser/parser.c +++ b/Parser/parser.c @@ -19978,7 +19978,7 @@ invalid_except_stmt_rule(Parser *p) ) { D(fprintf(stderr, "%*c+ invalid_except_stmt[%d-%d]: %s succeeded!\n", p->level, ' ', _mark, p->mark, "'except' expression ',' expressions ['as' NAME] ':'")); - _res = RAISE_SYNTAX_ERROR_STARTING_FROM ( a , "exception group must be parenthesized" ); + _res = RAISE_SYNTAX_ERROR_STARTING_FROM ( a , "multiple exception types must be parenthesized" ); if (_res == NULL && PyErr_Occurred()) { p->error_indicator = 1; D(p->level--); |