Skip to content

gh-133197: Improve error message for ft"" and bt"" cases #133202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sobolevn merged 4 commits into from
Apr 30, 2025
Merged

gh-133197: Improve error message for ft"" and bt"" cases #133202

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f57f3d
gh-133196: Improve error message for `ft""` case
sobolevn Apr 30, 2025
b269ebb
Also handle `tb` cases
sobolevn Apr 30, 2025
40668a5
Address review
sobolevn Apr 30, 2025
a4aa4c0
together
sobolevn Apr 30, 2025
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
Prev Previous commit
Next Next commit
Address review
  • Loading branch information
@sobolevn
sobolevn committed Apr 30, 2025
commit 40668a51a64c78ccf9fe516747d39093fa86f467
5 changes: 2 additions & 3 deletions Lib/test/test_syntax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1881,18 +1881,17 @@
Traceback (most recent call last):
SyntaxError: can't use 'f' and 't' string prefixes at the same time

>>> x = 1
>>> tf"{x=}"
Traceback (most recent call last):
SyntaxError: can't use 'f' and 't' string prefixes at the same time

>>> tb''
Traceback (most recent call last):
SyntaxError: can't use 't' prefix on bytes
SyntaxError: can't use 'b' and 't' string prefixes at the same time

>>> bt"text"
Traceback (most recent call last):
SyntaxError: can't use 't' prefix on bytes
SyntaxError: can't use 'b' and 't' string prefixes at the same time

>>> t'{x}' = 42
Traceback (most recent call last):
Expand Down
12 changes: 7 additions & 5 deletions Parser/lexer/lexer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,13 +672,15 @@ tok_get_normal_mode(struct tok_state *tok, tokenizer_mode* current_tok, struct t
c = tok_nextc(tok);
if (c == '"' || c == '\'') {
if (saw_b && saw_t) {
return MAKE_TOKEN(_PyTokenizer_syntaxerror(
tok,
"can't use 't' prefix on bytes"));
return MAKE_TOKEN(_PyTokenizer_syntaxerror_known_range(
tok, (int)(tok->start + 1 - tok->line_start),
(int)(tok->cur - tok->line_start),
"can't use 'b' and 't' string prefixes at the same time"));
}
if (saw_f && saw_t) {
return MAKE_TOKEN(_PyTokenizer_syntaxerror(
tok,
return MAKE_TOKEN(_PyTokenizer_syntaxerror_known_range(
tok, (int)(tok->start + 1 - tok->line_start),
(int)(tok->cur - tok->line_start),
"can't use 'f' and 't' string prefixes at the same time"));
}

Expand Down
Loading