diff options
| author | Nikita Sobolev <mail@sobolevn.me> | 2022-09-05 19:54:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-05 17:54:09 +0100 |
| commit | 2c7d2e8d46164efb6e27a64081d8e949f6876515 (patch) | |
| tree | 20cdb1ece49de9a14c731c62ab31dcab7929da09 | |
| parent | a9d58feccfd956dc99195af6872b06446738d7db (diff) | |
| download | cpython-git-2c7d2e8d46164efb6e27a64081d8e949f6876515.tar.gz | |
gh-96587: Raise `SyntaxError` for PEP654 on older `feature_version` (#96588)
| -rw-r--r-- | Grammar/python.gram | 4 | ||||
| -rw-r--r-- | Lib/test/test_ast.py | 9 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2022-09-05-19-20-44.gh-issue-96587.bVxhX2.rst | 2 | ||||
| -rw-r--r-- | Parser/parser.c | 2 |
4 files changed, 15 insertions, 2 deletions
diff --git a/Grammar/python.gram b/Grammar/python.gram index d4df78b679..51f846a57f 100644 --- a/Grammar/python.gram +++ b/Grammar/python.gram @@ -412,7 +412,9 @@ try_stmt[stmt_ty]: | invalid_try_stmt | 'try' &&':' b=block f=finally_block { _PyAST_Try(b, NULL, NULL, f, EXTRA) } | 'try' &&':' b=block ex[asdl_excepthandler_seq*]=except_block+ el=[else_block] f=[finally_block] { _PyAST_Try(b, ex, el, f, EXTRA) } - | 'try' &&':' b=block ex[asdl_excepthandler_seq*]=except_star_block+ el=[else_block] f=[finally_block] { _PyAST_TryStar(b, ex, el, f, EXTRA) } + | 'try' &&':' b=block ex[asdl_excepthandler_seq*]=except_star_block+ el=[else_block] f=[finally_block] { + CHECK_VERSION(stmt_ty, 11, "Exception groups are", + _PyAST_TryStar(b, ex, el, f, EXTRA)) } # Except statement diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py index 68617b10e3..c97d16132f 100644 --- a/Lib/test/test_ast.py +++ b/Lib/test/test_ast.py @@ -771,6 +771,15 @@ class AST_Tests(unittest.TestCase): with self.assertRaises(SyntaxError): ast.parse('(x := 0)', feature_version=(3, 7)) + def test_exception_groups_feature_version(self): + code = dedent(''' + try: ... + except* Exception: ... + ''') + ast.parse(code) + with self.assertRaises(SyntaxError): + ast.parse(code, feature_version=(3, 10)) + def test_invalid_major_feature_version(self): with self.assertRaises(ValueError): ast.parse('pass', feature_version=(2, 7)) diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-09-05-19-20-44.gh-issue-96587.bVxhX2.rst b/Misc/NEWS.d/next/Core and Builtins/2022-09-05-19-20-44.gh-issue-96587.bVxhX2.rst new file mode 100644 index 0000000000..37e9dcbb11 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-09-05-19-20-44.gh-issue-96587.bVxhX2.rst @@ -0,0 +1,2 @@ +Correctly raise ``SyntaxError`` on exception groups (:pep:`654`) on python +versions prior to 3.11 diff --git a/Parser/parser.c b/Parser/parser.c index c9366d5992..bec51fe4a9 100644 --- a/Parser/parser.c +++ b/Parser/parser.c @@ -6970,7 +6970,7 @@ try_stmt_rule(Parser *p) UNUSED(_end_lineno); // Only used by EXTRA macro int _end_col_offset = _token->end_col_offset; UNUSED(_end_col_offset); // Only used by EXTRA macro - _res = _PyAST_TryStar ( b , ex , el , f , EXTRA ); + _res = CHECK_VERSION ( stmt_ty , 11 , "Exception groups are" , _PyAST_TryStar ( b , ex , el , f , EXTRA ) ); if (_res == NULL && PyErr_Occurred()) { p->error_indicator = 1; p->level--; |