Commit057a41e

authored and

committed

pythongh-134582: Fix t-strings untokenize() roundtrip removing space between braces (pythonGH-134603)

(cherry picked from commit52509cc)Co-authored-by: Loïc Simon <loic.pano@gmail.com>

1 parentcbf4ccf commit057a41eCopy full SHA for 057a41e

File tree

+12

-7

lines changed

+12

-7

lines changed

Lines changed: 4 additions & 0 deletions

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ def compat(self, token, iterable):`
`274`	`274`	`toks_append=self.tokens.append`
`275`	`275`	`startline=token[0]in (NEWLINE,NL)`
`276`	`276`	`prevstring=False`
`277`		`-in_fstring=0`
	`277`	`+in_fstring_or_tstring=0`
`278`	`278`
`279`	`279`	`fortokin_itertools.chain([token],iterable):`
`280`	`280`	`toknum,tokval=tok[:2]`
`@@ -293,10 +293,10 @@ def compat(self, token, iterable):`
`293`	`293`	`else:`
`294`	`294`	`prevstring=False`
`295`	`295`
`296`		`-iftoknum==FSTRING_START:`
`297`		`-in_fstring+=1`
`298`		`-eliftoknum==FSTRING_END:`
`299`		`-in_fstring-=1`
	`296`	`+iftoknumin {FSTRING_START,TSTRING_START}:`
	`297`	`+in_fstring_or_tstring+=1`
	`298`	`+eliftoknumin {FSTRING_END,TSTRING_END}:`
	`299`	`+in_fstring_or_tstring-=1`
`300`	`300`	`iftoknum==INDENT:`
`301`	`301`	`indents.append(tokval)`
`302`	`302`	`continue`
`@@ -311,8 +311,8 @@ def compat(self, token, iterable):`
`311`	`311`	`eliftoknumin {FSTRING_MIDDLE,TSTRING_MIDDLE}:`
`312`	`312`	`tokval=self.escape_brackets(tokval)`
`313`	`313`
`314`		`-# Insert a space between two consecutive brackets if we are in an f-string`
`315`		`-iftokvalin {"{","}"}andself.tokensandself.tokens[-1]==tokvalandin_fstring:`
	`314`	`+# Insert a space between two consecutive brackets if we are in an f-string or t-string`
	`315`	`+iftokvalin {"{","}"}andself.tokensandself.tokens[-1]==tokvalandin_fstring_or_tstring:`
`316`	`316`	`tokval=' '+tokval`
`317`	`317`
`318`	`318`	`# Insert a space between two consecutive f-strings`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix tokenize.untokenize() round-trip errors related to t-strings braces escaping`

Comments

(0)