https://github.com/python/cpython/commit/2009e25e26040dca32696e70f91f13665350e7fd
commit: 2009e25e26040dca32696e70f91f13665350e7fd
branch: main
author: Pablo Galindo Salgado <[email protected]>
committer: pablogsal <[email protected]>
date: 2024-07-19T19:08:08+02:00
summary:
gh-122026: Fix identification of mismatched parentheses inside f-strings
(#122028)
files:
A Misc/NEWS.d/next/Core and
Builtins/2024-07-19-15-28-05.gh-issue-122026.sta2Ca.rst
M Lib/test/test_fstring.py
M Parser/lexer/lexer.c
diff --git a/Lib/test/test_fstring.py b/Lib/test/test_fstring.py
index 50fcb4708e3741..5da3c38014ebe4 100644
--- a/Lib/test/test_fstring.py
+++ b/Lib/test/test_fstring.py
@@ -896,6 +896,7 @@ def test_missing_expression(self):
"f'{:2}'",
"f'''{\t\f\r\n:a}'''",
"f'{:'",
+ "F'{[F'{:'}[F'{:'}]]]",
])
self.assertAllRaise(SyntaxError,
diff --git a/Misc/NEWS.d/next/Core and
Builtins/2024-07-19-15-28-05.gh-issue-122026.sta2Ca.rst b/Misc/NEWS.d/next/Core
and Builtins/2024-07-19-15-28-05.gh-issue-122026.sta2Ca.rst
new file mode 100644
index 00000000000000..2721a405a50446
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and
Builtins/2024-07-19-15-28-05.gh-issue-122026.sta2Ca.rst
@@ -0,0 +1,2 @@
+Fix a bug that caused the tokenizer to not correctly identify mismatched
+parentheses inside f-strings in some situations. Patch by Pablo Galindo
diff --git a/Parser/lexer/lexer.c b/Parser/lexer/lexer.c
index 9ca3bd6a738e1b..8c868593f944c8 100644
--- a/Parser/lexer/lexer.c
+++ b/Parser/lexer/lexer.c
@@ -1238,6 +1238,9 @@ tok_get_normal_mode(struct tok_state *tok,
tokenizer_mode* current_tok, struct t
if (INSIDE_FSTRING(tok)) {
current_tok->curly_bracket_depth--;
+ if (current_tok->curly_bracket_depth < 0) {
+ return MAKE_TOKEN(_PyTokenizer_syntaxerror(tok, "f-string:
unmatched '%c'", c));
+ }
if (c == '}' && current_tok->curly_bracket_depth ==
current_tok->curly_bracket_expr_start_depth) {
current_tok->curly_bracket_expr_start_depth--;
current_tok->kind = TOK_FSTRING_MODE;
_______________________________________________
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]
