Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-122026: Fix identification of mismatched parentheses inside f-strings (#122028)

This commit is contained in:
Pablo Galindo Salgado 2024-07-19 19:08:08 +02:00 committed by GitHub
parent 186b4d8ea2
commit 2009e25e26
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/test/test_fstring.py
View File

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

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/lexer/lexer.c
View File

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