From ae0be5a53bb4caee3de4888341addd9c94133f2d Mon Sep 17 00:00:00 2001
From: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
Date: Mon, 18 Jul 2022 02:20:12 -0700
Subject: [PATCH] gh-94947: Disallow parsing walrus with feature_version < (3,
8) (#94948)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* gh-94947: Disallow parsing walrus with feature_version < (3, 8)
* oops, commit the parser
* 📜🤖 Added by blurb_it.
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
---
Grammar/python.gram | 4 +++-
Lib/test/test_ast.py | 5 +++++
.../2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst | 1 +
Parser/parser.c | 2 +-
4 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst
diff --git a/Grammar/python.gram b/Grammar/python.gram
index 91d73a9fffd..6a8bb942fff 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -660,7 +660,9 @@ star_named_expression[expr_ty]:
| named_expression
assignment_expression[expr_ty]:
- | a=NAME ':=' ~ b=expression { _PyAST_NamedExpr(CHECK(expr_ty, _PyPegen_set_expr_context(p, a, Store)), b, EXTRA) }
+ | a=NAME ':=' ~ b=expression {
+ CHECK_VERSION(expr_ty, 8, "Assignment expressions are",
+ _PyAST_NamedExpr(CHECK(expr_ty, _PyPegen_set_expr_context(p, a, Store)), b, EXTRA)) }
named_expression[expr_ty]:
| assignment_expression
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 225892414b8..5d7e4419560 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -743,6 +743,11 @@ def test_issue40614_feature_version(self):
with self.assertRaises(SyntaxError):
ast.parse('f"{x=}"', feature_version=(3, 7))
+ 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_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-07-18-04-48-34.gh-issue-94947.df9gUw.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst
new file mode 100644
index 00000000000..360ea67048f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst
@@ -0,0 +1 @@
+:func:`ast.parse` will no longer parse assignment expressions when passed ``feature_version`` less than ``(3, 8)``. Patch by Shantanu Jain.
diff --git a/Parser/parser.c b/Parser/parser.c
index 3d59d4a704c..309c249141d 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -11223,7 +11223,7 @@ assignment_expression_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_NamedExpr ( CHECK ( expr_ty , _PyPegen_set_expr_context ( p , a , Store ) ) , b , EXTRA );
+ _res = CHECK_VERSION ( expr_ty , 8 , "Assignment expressions are" , _PyAST_NamedExpr ( CHECK ( expr_ty , _PyPegen_set_expr_context ( p , a , Store ) ) , b , EXTRA ) );
if (_res == NULL && PyErr_Occurred()) {
p->error_indicator = 1;
p->level--;
--
GitLab