mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[3.12] gh-122026: Fix identification of mismatched parentheses inside f-strings (GH-122028) (#122062)

Browse source 
(cherry picked from commit 2009e25e26)

Signed-off-by: Pablo Galindo <pablogsal@gmail.com>
This commit is contained in:
Pablo Galindo Salgado 2024-07-21 01:03:10 +02:00 • committed by GitHub
parent 0298da432d
commit 966eff9ce4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/test/test_fstring.py
View file

@ -921,6 +921,7 @@ x = (
"f'{:2}'",
"f'''{\t\f\r\n:a}'''",
"f'{:'",
"F'{[F'{:'}[F'{:'}]]]",
],
)

2
Misc/NEWS.d/next/Core and Builtins/2024-07-19-15-28-05.gh-issue-122026.sta2Ca.rst Normal file
View file

@ -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

3
Parser/tokenizer.c
View file

@ -2607,6 +2607,9 @@ letter_quote:
if (INSIDE_FSTRING(tok)) {
current_tok->curly_bracket_depth--;
if (current_tok->curly_bracket_depth < 0) {
return MAKE_TOKEN(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--;