Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Lib/test/test_fstring.py
Original file line number Diff line number Diff line change
Expand Up @@ -1849,6 +1849,13 @@ def __format__(self, format):
# Test multiple format specs in same raw f-string
self.assertEqual(rf"{UnchangedFormat():\xFF} {UnchangedFormat():\n}", '\\xFF \\n')

def test_gh139516(self):
with temp_cwd():
script = 'script.py'
with open(script, 'wb') as f:
f.write('''def f(a): pass\nf"{f(a=lambda: 'à'\n)}"'''.encode())
assert_python_ok(script)


if __name__ == '__main__':
unittest.main()
17 changes: 17 additions & 0 deletions Lib/test/test_tokenize.py
Original file line number Diff line number Diff line change
Expand Up @@ -1212,6 +1212,23 @@ def test_multiline_non_ascii_fstring_with_expr(self):
FSTRING_END "\'\'\'" (3, 1) (3, 4)
""")

# gh-139516, the '\n' is explicit to ensure no trailing whitespace which would invalidate the test
self.check_tokenize('''f"{f(a=lambda: 'à'\n)}"''', """\
FSTRING_START \'f"\' (1, 0) (1, 2)
OP '{' (1, 2) (1, 3)
NAME 'f' (1, 3) (1, 4)
OP '(' (1, 4) (1, 5)
NAME 'a' (1, 5) (1, 6)
OP '=' (1, 6) (1, 7)
NAME 'lambda' (1, 7) (1, 13)
OP ':' (1, 13) (1, 14)
STRING "\'à\'" (1, 15) (1, 18)
NL '\\n' (1, 18) (1, 19)
OP ')' (2, 0) (2, 1)
OP '}' (2, 1) (2, 2)
FSTRING_END \'"\' (2, 2) (2, 3)
""")

class GenerateTokensTest(TokenizeTest):
def check_tokenize(self, s, expected):
# Format the tokens in s in a table format.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix lambda colon erroneously start format spec in f-string in tokenizer.
2 changes: 1 addition & 1 deletion Parser/lexer/lexer.c
Original file line number Diff line number Diff line change
Expand Up @@ -1291,7 +1291,7 @@ tok_get_normal_mode(struct tok_state *tok, tokenizer_mode* current_tok, struct t
return MAKE_TOKEN(_PyTokenizer_syntaxerror(tok, "invalid non-printable character U+%04X", c));
}

if( c == '=' && INSIDE_FSTRING_EXPR(current_tok)) {
if( c == '=' && INSIDE_FSTRING_EXPR_AT_TOP(current_tok)) {
current_tok->f_string_debug = 1;
}

Expand Down
2 changes: 2 additions & 0 deletions Parser/lexer/state.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#define INSIDE_FSTRING(tok) (tok->tok_mode_stack_index > 0)
#define INSIDE_FSTRING_EXPR(tok) (tok->curly_bracket_expr_start_depth >= 0)
#define INSIDE_FSTRING_EXPR_AT_TOP(tok) \
(tok->curly_bracket_depth - tok->curly_bracket_expr_start_depth == 1)

enum decoding_state {
STATE_INIT,
Expand Down
Loading