https://github.com/python/cpython/commit/7a3518e43aa50ea57fd35863da831052749b6115
commit: 7a3518e43aa50ea57fd35863da831052749b6115
branch: main
author: Alex Waygood <[email protected]>
committer: AlexWaygood <[email protected]>
date: 2024-02-26T09:22:09Z
summary:
gh-115881: Ensure `ast.parse()` parses conditional context managers even with
low `feature_version` passed (#115920)
files:
A Misc/NEWS.d/next/Library/2024-02-25-19-20-05.gh-issue-115881.ro_Kuw.rst
M Grammar/python.gram
M Lib/test/test_ast.py
M Lib/test/test_type_comments.py
M Parser/parser.c
diff --git a/Grammar/python.gram b/Grammar/python.gram
index 174b4dbb6f7842..797c195a0a91ba 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -393,7 +393,7 @@ for_stmt[stmt_ty]:
with_stmt[stmt_ty]:
| invalid_with_stmt_indent
| 'with' '(' a[asdl_withitem_seq*]=','.with_item+ ','? ')' ':'
tc=[TYPE_COMMENT] b=block {
- CHECK_VERSION(stmt_ty, 9, "Parenthesized context managers are",
_PyAST_With(a, b, NEW_TYPE_COMMENT(p, tc), EXTRA)) }
+ _PyAST_With(a, b, NEW_TYPE_COMMENT(p, tc), EXTRA) }
| 'with' a[asdl_withitem_seq*]=','.with_item+ ':' tc=[TYPE_COMMENT]
b=block {
_PyAST_With(a, b, NEW_TYPE_COMMENT(p, tc), EXTRA) }
| 'async' 'with' '(' a[asdl_withitem_seq*]=','.with_item+ ','? ')' ':'
b=block {
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 3789ac22e3899c..d49c149da42592 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -1045,19 +1045,15 @@ def test_positional_only_feature_version(self):
with self.assertRaises(SyntaxError):
ast.parse('lambda x=1, /: ...', feature_version=(3, 7))
- def test_parenthesized_with_feature_version(self):
- ast.parse('with (CtxManager() as example): ...', feature_version=(3,
10))
- # While advertised as a feature in Python 3.10, this was allowed
starting 3.9
- ast.parse('with (CtxManager() as example): ...', feature_version=(3,
9))
- with self.assertRaises(SyntaxError):
- ast.parse('with (CtxManager() as example): ...',
feature_version=(3, 8))
- ast.parse('with CtxManager() as example: ...', feature_version=(3, 8))
-
def test_assignment_expression_feature_version(self):
ast.parse('(x := 0)', feature_version=(3, 8))
with self.assertRaises(SyntaxError):
ast.parse('(x := 0)', feature_version=(3, 7))
+ def test_conditional_context_managers_parse_with_low_feature_version(self):
+ # regression test for gh-115881
+ ast.parse('with (x() if y else z()): ...', feature_version=(3, 8))
+
def test_exception_groups_feature_version(self):
code = dedent('''
try: ...
diff --git a/Lib/test/test_type_comments.py b/Lib/test/test_type_comments.py
index 5a911da56f8f8a..ee8939f62d082c 100644
--- a/Lib/test/test_type_comments.py
+++ b/Lib/test/test_type_comments.py
@@ -309,7 +309,7 @@ def test_withstmt(self):
self.assertEqual(tree.body[0].type_comment, None)
def test_parenthesized_withstmt(self):
- for tree in self.parse_all(parenthesized_withstmt, minver=9):
+ for tree in self.parse_all(parenthesized_withstmt):
self.assertEqual(tree.body[0].type_comment, "int")
self.assertEqual(tree.body[1].type_comment, "int")
tree = self.classic_parse(parenthesized_withstmt)
diff --git
a/Misc/NEWS.d/next/Library/2024-02-25-19-20-05.gh-issue-115881.ro_Kuw.rst
b/Misc/NEWS.d/next/Library/2024-02-25-19-20-05.gh-issue-115881.ro_Kuw.rst
new file mode 100644
index 00000000000000..99bccb265ff80c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-02-25-19-20-05.gh-issue-115881.ro_Kuw.rst
@@ -0,0 +1,4 @@
+Fix issue where :func:`ast.parse` would incorrectly flag conditional context
+managers (such as ``with (x() if y else z()): ...``) as invalid syntax if
+``feature_version=(3, 8)`` was passed. This reverts changes to the
+grammar made as part of gh-94949.
diff --git a/Parser/parser.c b/Parser/parser.c
index 779b18e9650e9f..f1170c26197452 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -6603,7 +6603,7 @@ with_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 = CHECK_VERSION ( stmt_ty , 9 , "Parenthesized context
managers are" , _PyAST_With ( a , b , NEW_TYPE_COMMENT ( p , tc ) , EXTRA ) );
+ _res = _PyAST_With ( a , b , NEW_TYPE_COMMENT ( p , tc ) , EXTRA );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
