mirror of
https://github.com/python/cpython
synced 2024-10-05 08:19:57 +00:00
[3.12] gh-115881: Ensure ast.parse()
parses conditional context managers even with low feature_version
passed (#115920) (#115959)
This commit is contained in:
parent
1932da0c3d
commit
53b84e772c
|
@ -392,7 +392,7 @@ for_stmt[stmt_ty]:
|
|||
with_stmt[stmt_ty]:
|
||||
| invalid_with_stmt_indent
|
||||
| 'with' '(' a[asdl_withitem_seq*]=','.with_item+ ','? ')' ':' b=block {
|
||||
CHECK_VERSION(stmt_ty, 9, "Parenthesized context managers are", _PyAST_With(a, b, NULL, EXTRA)) }
|
||||
_PyAST_With(a, b, NULL, 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 {
|
||||
|
|
|
@ -1007,19 +1007,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: ...
|
||||
|
|
|
@ -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.
|
2
Parser/parser.c
generated
2
Parser/parser.c
generated
|
@ -6566,7 +6566,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 , NULL , EXTRA ) );
|
||||
_res = _PyAST_With ( a , b , NULL , EXTRA );
|
||||
if (_res == NULL && PyErr_Occurred()) {
|
||||
p->error_indicator = 1;
|
||||
p->level--;
|
||||
|
|
Loading…
Reference in a new issue