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

gh-134582: Fix t-strings untokenize() roundtrip removing space between braces (#134603)

Browse source
This commit is contained in:
Loïc Simon 2025-05-25 18:23:38 +02:00 • committed by GitHub
parent 3e562b3942
commit 52509cc94b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_tokenize.py
View file

@ -1975,6 +1975,10 @@ if 1:
for case in cases:
self.check_roundtrip(case)
self.check_roundtrip(r"t'{ {}}'")
self.check_roundtrip(r"t'{f'{ {}}'}{ {}}'")
self.check_roundtrip(r"f'{t'{ {}}'}{ {}}'")
def test_continuation(self):
# Balancing continuation

14
Lib/tokenize.py
View file

@ -274,7 +274,7 @@ class Untokenizer:
toks_append = self.tokens.append
startline = token[0] in (NEWLINE, NL)
prevstring = False
in_fstring = 0
in_fstring_or_tstring = 0
for tok in _itertools.chain([token], iterable):
toknum, tokval = tok[:2]
@ -293,10 +293,10 @@ class Untokenizer:
else:
prevstring = False
if toknum == FSTRING_START:
in_fstring += 1
elif toknum == FSTRING_END:
in_fstring -= 1
if toknum in {FSTRING_START, TSTRING_START}:
in_fstring_or_tstring += 1
elif toknum in {FSTRING_END, TSTRING_END}:
in_fstring_or_tstring -= 1
if toknum == INDENT:
indents.append(tokval)
continue
@ -311,8 +311,8 @@ class Untokenizer:
elif toknum in {FSTRING_MIDDLE, TSTRING_MIDDLE}:
tokval = self.escape_brackets(tokval)
# Insert a space between two consecutive brackets if we are in an f-string
if tokval in {"{", "}"} and self.tokens and self.tokens[-1] == tokval and in_fstring:
# Insert a space between two consecutive brackets if we are in an f-string or t-string
if tokval in {"{", "}"} and self.tokens and self.tokens[-1] == tokval and in_fstring_or_tstring:
tokval = ' ' + tokval
# Insert a space between two consecutive f-strings

1
Misc/NEWS.d/next/Library/2025-05-23-23-43-39.gh-issue-134582.9POq3l.rst Normal file
View file

@ -0,0 +1 @@
Fix tokenize.untokenize() round-trip errors related to t-strings braces escaping