From 9cb7324e8fc37350879fc6004ebbbb1cf5f9dd02 Mon Sep 17 00:00:00 2001
From: Nikita Sobolev <mail@sobolevn.me>
Date: Thu, 6 Oct 2022 01:00:13 +0300
Subject: [PATCH] [3.11] gh-96587: Raise `SyntaxError` for PEP654 on older
`feature_version` (GH-96588) (#96591)
(cherry picked from commit 2c7d2e8d46164efb6e27a64081d8e949f6876515)
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
---
Grammar/python.gram | 4 +++-
Lib/test/test_ast.py | 9 +++++++++
.../2022-09-05-19-20-44.gh-issue-96587.bVxhX2.rst | 2 ++
Parser/parser.c | 2 +-
4 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 Misc/NEWS.d/next/Core and Builtins/2022-09-05-19-20-44.gh-issue-96587.bVxhX2.rst
diff --git a/Grammar/python.gram b/Grammar/python.gram
index d4df78b679a..51f846a57f4 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 7275e1559e5..90ad6af56fd 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -771,6 +771,15 @@ def test_assignment_expression_feature_version(self):
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_constant_as_name(self):
for constant in "True", "False", "None":
expr = ast.Expression(ast.Name(constant, ast.Load()))
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 00000000000..37e9dcbb11f
--- /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 e13dbe04cf9..3fc12e50833 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--;
--
GitLab