diff options
author | Shantanu <hauntsaninja@users.noreply.github.com> | 2020-06-06 10:08:48 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-06 10:08:48 (GMT) |
commit | f7ed4d4e83f5d9e85e244a1cbc460f26436ab24d (patch) | |
tree | de469bc0aa35508ca96bfaa8dd5e4cda290d925f | |
parent | c067183605cf84bb1a246635f52827251d0476f8 (diff) | |
download | cpython-f7ed4d4e83f5d9e85e244a1cbc460f26436ab24d.zip cpython-f7ed4d4e83f5d9e85e244a1cbc460f26436ab24d.tar.gz cpython-f7ed4d4e83f5d9e85e244a1cbc460f26436ab24d.tar.bz2 |
bpo-40614: Respect feature version for f-string debug expressions (GH-20196) (GH-20466)
Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
(cherry picked from commit c116c94ff119485761460f1033cdee425bed0310)
-rw-r--r-- | Lib/test/test_ast.py | 6 | ||||
-rw-r--r-- | Misc/NEWS.d/next/Library/2020-05-18-22-41-02.bpo-40614.8j3kmq.rst | 1 | ||||
-rw-r--r-- | Python/ast.c | 6 |
3 files changed, 13 insertions, 0 deletions
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py index 486f2aa..8693466 100644 --- a/Lib/test/test_ast.py +++ b/Lib/test/test_ast.py @@ -630,6 +630,12 @@ class AST_Tests(unittest.TestCase): attr_b = tree.body[0].decorator_list[0].value self.assertEqual(attr_b.end_col_offset, 4) + def test_issue40614_feature_version(self): + ast.parse('f"{x=}"', feature_version=(3, 8)) + with self.assertRaises(SyntaxError): + ast.parse('f"{x=}"', feature_version=(3, 7)) + + class ASTHelpers_Test(unittest.TestCase): maxDiff = None diff --git a/Misc/NEWS.d/next/Library/2020-05-18-22-41-02.bpo-40614.8j3kmq.rst b/Misc/NEWS.d/next/Library/2020-05-18-22-41-02.bpo-40614.8j3kmq.rst new file mode 100644 index 0000000..238b98c --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-05-18-22-41-02.bpo-40614.8j3kmq.rst @@ -0,0 +1 @@ +:func:`ast.parse` will not parse self documenting expressions in f-strings when passed ``feature_version`` is less than ``(3, 8)``. diff --git a/Python/ast.c b/Python/ast.c index f70d48b..594879b 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -5202,6 +5202,12 @@ fstring_find_expr(const char **str, const char *end, int raw, int recurse_lvl, /* Check for =, which puts the text value of the expression in expr_text. */ if (**str == '=') { + if (c->c_feature_version < 8) { + ast_error(c, n, + "f-string: self documenting expressions are " + "only supported in Python 3.8 and greater"); + goto error; + } *str += 1; /* Skip over ASCII whitespace. No need to test for end of string |