fix the regex some more

psf · Aug 1, 2024 · b5d954d · b5d954d
1 parent b3f17f4
commit b5d954d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/blib2to3/pgen2/tokenize.py b/src/blib2to3/pgen2/tokenize.py
@@ -136,12 +136,12 @@ def _combinations(*l: str) -> Set[str]:
 )
 
 # beginning of a single quoted f-string. must not end with `{{` or `\N{`
-SingleLbrace = r"(?:\\N{|\\[^{]|{{|[^\n'\\{])*(?<!\\N)({)(?!{)"
-DoubleLbrace = r'(?:\\N{|\\[^{]|{{|[^\n"\\{])*(?<!\\N)({)(?!{)'
+SingleLbrace = r"(?:\\N{|{{|\\'|[^\n'{])*(?<!\\N)({)(?!{)"
+DoubleLbrace = r'(?:\\N{|{{|\\"|[^\n"{])*(?<!\\N)({)(?!{)'
 
 # beginning of a triple quoted f-string. must not end with `{{` or `\N{`
-Single3Lbrace = r"(?:\\N{|\\[^{]|{{|'(?!'')|[^'{\\])*(?<!\\N){(?!{)"
-Double3Lbrace = r'(?:\\N{|\\[^{]|{{|"(?!"")|[^"{\\])*(?<!\\N){(?!{)'
+Single3Lbrace = r"(?:\\N{|{{|\\'|'(?!'')|[^'{])*(?<!\\N){(?!{)"
+Double3Lbrace = r'(?:\\N{|{{|\\"|"(?!"")|[^"{])*(?<!\\N){(?!{)'
 
 # ! format specifier inside an fstring brace, ensure it's not a `!=` token
 Bang = Whitespace + group("!") + r"(?!=)"

diff --git a/tests/data/cases/pep_701.py b/tests/data/cases/pep_701.py
@@ -133,6 +133,8 @@
 
 f'{1}\{{'
 f'{2} foo \{{[\}}'
+f'\{3}'
+rf"\{"a"}"
 
 # output
 
@@ -270,3 +272,5 @@
 
 f"{1}\{{"
 f"{2} foo \{{[\}}"
+f"\{3}"
+rf"\{"a"}"