Commita6c1081

authored

[3.13]gh-122026: Fix identification of mismatched parentheses inside f-strings (GH-122028) (#122041)

1 parent9a332f2 commita6c1081Copy full SHA for a6c1081

File tree

-0

lines changed

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -897,6 +897,7 @@ def test_missing_expression(self):`
`897`	`897`	`"f'{:2}'",`
`898`	`898`	`"f'''{\t\f\r\n:a}'''",`
`899`	`899`	`"f'{:'",`
	`900`	`+"F'{[F'{:'}[F'{:'}]]]",`
`900`	`901`	`])`
`901`	`902`
`902`	`903`	`self.assertAllRaise(SyntaxError,`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix a bug that caused the tokenizer to not correctly identify mismatched`
	`2`	`+parentheses inside f-strings in some situations. Patch by Pablo Galindo`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1238,6 +1238,9 @@ tok_get_normal_mode(struct tok_state tok, tokenizer_mode current_tok, struct t`
`1238`	`1238`
`1239`	`1239`	`if (INSIDE_FSTRING(tok)) {`
`1240`	`1240`	`current_tok->curly_bracket_depth--;`
	`1241`	`+if (current_tok->curly_bracket_depth<0) {`
	`1242`	`+returnMAKE_TOKEN(_PyTokenizer_syntaxerror(tok,"f-string: unmatched '%c'",c));`
	`1243`	`+ }`
`1241`	`1244`	`if (c=='}'&&current_tok->curly_bracket_depth==current_tok->curly_bracket_expr_start_depth) {`
`1242`	`1245`	`current_tok->curly_bracket_expr_start_depth--;`
`1243`	`1246`	`current_tok->kind=TOK_FSTRING_MODE;`

Comments

(0)