Fix another f-string regression

psf · Apr 27, 2024 · 40c5083 · 40c5083
1 parent dbb956b
commit 40c5083
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -25,6 +25,8 @@
 ### Parser
 
 <!-- Changes to the parser or to version autodetection -->
+- Fix regression where Black failed to parse a multiline f-string containing
+  another multiline f-string (#4339)
 
 ### Performance
 

diff --git a/src/blib2to3/pgen2/tokenize.py b/src/blib2to3/pgen2/tokenize.py
@@ -623,7 +623,7 @@ def generate_tokens(
                 epos = (lnum, end)
                 tokenline = contline + line
                 if (
-                    fstring_state.current() == STATE_NOT_FSTRING
+                    fstring_state.current() in (STATE_NOT_FSTRING, STATE_IN_BRACES)
                     and not is_fstring_start(token)
                 ):
                     yield (STRING, token, spos, epos, tokenline)

diff --git a/tests/data/cases/pep_701.py b/tests/data/cases/pep_701.py
@@ -125,6 +125,9 @@
 
 f'{{\\"kind\\":\\"ConfigMap\\",\\"metadata\\":{{\\"annotations\\":{{}},\\"name\\":\\"cluster-info\\",\\"namespace\\":\\"amazon-cloudwatch\\"}}}}'
 
+f"""{'''
+'''}"""
+
 # output
 
 x = f"foo"
@@ -252,3 +255,6 @@
 f"{1:{2}d}"
 
 f'{{\\"kind\\":\\"ConfigMap\\",\\"metadata\\":{{\\"annotations\\":{{}},\\"name\\":\\"cluster-info\\",\\"namespace\\":\\"amazon-cloudwatch\\"}}}}'
+
+f"""{'''
+'''}"""