mirror of
https://github.com/python/cpython.git
synced 2025-10-17 12:18:23 +00:00
bpo-36332: Allow compile() to handle AST objects with assignment expressions (GH-12398)
This commit is contained in:
parent
2ddc7f6d62
commit
0c9258a6d2
3 changed files with 17 additions and 3 deletions
|
@ -135,6 +135,9 @@ exec_tests = [
|
||||||
"@deco1\n@deco2()\nclass C: pass",
|
"@deco1\n@deco2()\nclass C: pass",
|
||||||
# Decorator with generator argument
|
# Decorator with generator argument
|
||||||
"@deco(a for a in b)\ndef f(): pass",
|
"@deco(a for a in b)\ndef f(): pass",
|
||||||
|
# Simple assignment expression
|
||||||
|
"(a := 1)",
|
||||||
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# These are compiled through "single"
|
# These are compiled through "single"
|
||||||
|
@ -276,6 +279,13 @@ class AST_Tests(unittest.TestCase):
|
||||||
with self.subTest(action="compiling", input=i, kind=kind):
|
with self.subTest(action="compiling", input=i, kind=kind):
|
||||||
compile(ast_tree, "?", kind)
|
compile(ast_tree, "?", kind)
|
||||||
|
|
||||||
|
def test_ast_validation(self):
|
||||||
|
# compile() is the only function that calls PyAST_Validate
|
||||||
|
snippets_to_validate = exec_tests + single_tests + eval_tests
|
||||||
|
for snippet in snippets_to_validate:
|
||||||
|
tree = ast.parse(snippet)
|
||||||
|
compile(tree, '<string>', 'exec')
|
||||||
|
|
||||||
def test_slice(self):
|
def test_slice(self):
|
||||||
slc = ast.parse("x[::]").body[0].value.slice
|
slc = ast.parse("x[::]").body[0].value.slice
|
||||||
self.assertIsNone(slc.upper)
|
self.assertIsNone(slc.upper)
|
||||||
|
@ -1677,6 +1687,7 @@ exec_results = [
|
||||||
('Module', [('AsyncFunctionDef', (3, 0), 'f', ('arguments', [], None, [], [], None, []), [('Pass', (3, 15))], [('Name', (1, 1), 'deco1', ('Load',)), ('Call', (2, 0), ('Name', (2, 1), 'deco2', ('Load',)), [], [])], None, None)], []),
|
('Module', [('AsyncFunctionDef', (3, 0), 'f', ('arguments', [], None, [], [], None, []), [('Pass', (3, 15))], [('Name', (1, 1), 'deco1', ('Load',)), ('Call', (2, 0), ('Name', (2, 1), 'deco2', ('Load',)), [], [])], None, None)], []),
|
||||||
('Module', [('ClassDef', (3, 0), 'C', [], [], [('Pass', (3, 9))], [('Name', (1, 1), 'deco1', ('Load',)), ('Call', (2, 0), ('Name', (2, 1), 'deco2', ('Load',)), [], [])])], []),
|
('Module', [('ClassDef', (3, 0), 'C', [], [], [('Pass', (3, 9))], [('Name', (1, 1), 'deco1', ('Load',)), ('Call', (2, 0), ('Name', (2, 1), 'deco2', ('Load',)), [], [])])], []),
|
||||||
('Module', [('FunctionDef', (2, 0), 'f', ('arguments', [], None, [], [], None, []), [('Pass', (2, 9))], [('Call', (1, 1), ('Name', (1, 1), 'deco', ('Load',)), [('GeneratorExp', (1, 5), ('Name', (1, 6), 'a', ('Load',)), [('comprehension', ('Name', (1, 12), 'a', ('Store',)), ('Name', (1, 17), 'b', ('Load',)), [], 0)])], [])], None, None)], []),
|
('Module', [('FunctionDef', (2, 0), 'f', ('arguments', [], None, [], [], None, []), [('Pass', (2, 9))], [('Call', (1, 1), ('Name', (1, 1), 'deco', ('Load',)), [('GeneratorExp', (1, 5), ('Name', (1, 6), 'a', ('Load',)), [('comprehension', ('Name', (1, 12), 'a', ('Store',)), ('Name', (1, 17), 'b', ('Load',)), [], 0)])], [])], None, None)], []),
|
||||||
|
('Module', [('Expr', (1, 0), ('NamedExpr', (1, 1), ('Name', (1, 1), 'a', ('Store',)), ('Constant', (1, 6), 1, None)))], []),
|
||||||
]
|
]
|
||||||
single_results = [
|
single_results = [
|
||||||
('Interactive', [('Expr', (1, 0), ('BinOp', (1, 0), ('Constant', (1, 0), 1, None), ('Add',), ('Constant', (1, 2), 2, None)))]),
|
('Interactive', [('Expr', (1, 0), ('BinOp', (1, 0), ('Constant', (1, 0), 1, None), ('Add',), ('Constant', (1, 2), 2, None)))]),
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
The builtin :func:`compile` can now handle AST objects that contain
|
||||||
|
assignment expressions. Patch by Pablo Galindo.
|
|
@ -316,13 +316,14 @@ validate_expr(expr_ty exp, expr_context_ty ctx)
|
||||||
return validate_exprs(exp->v.List.elts, ctx, 0);
|
return validate_exprs(exp->v.List.elts, ctx, 0);
|
||||||
case Tuple_kind:
|
case Tuple_kind:
|
||||||
return validate_exprs(exp->v.Tuple.elts, ctx, 0);
|
return validate_exprs(exp->v.Tuple.elts, ctx, 0);
|
||||||
|
case NamedExpr_kind:
|
||||||
|
return validate_expr(exp->v.NamedExpr.value, Load);
|
||||||
/* This last case doesn't have any checking. */
|
/* This last case doesn't have any checking. */
|
||||||
case Name_kind:
|
case Name_kind:
|
||||||
return 1;
|
return 1;
|
||||||
default:
|
|
||||||
PyErr_SetString(PyExc_SystemError, "unexpected expression");
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
PyErr_SetString(PyExc_SystemError, "unexpected expression");
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue