Skip to content
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

Jump to bottom

bpo-46762: Fix an assert failure in f-strings where > or < is the last character if the f-string is missing a trailing right brace. #31365

Merged
merged 5 commits into from Feb 16, 2022
Merged

bpo-46762: Fix an assert failure in f-strings where > or < is the last character if the f-string is missing a trailing right brace. #31365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f915add
For multi-character tokens like <=, >=, ==, fix assert when the first…
ericvsmith Feb 16, 2022
b53c09c
Add blurb.
ericvsmith Feb 16, 2022
6ee0c4f
Fixed handling of '='.
ericvsmith Feb 16, 2022
133d107
Fix test case for '='.
ericvsmith Feb 16, 2022
6bf6216
Remove some spaces added by Visual Studio. Improve a comment.
ericvsmith Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Lib/test/test_fstring.py
View file
Open in desktop
Expand Up @@ -1053,6 +1053,8 @@ def test_mismatched_braces(self):
"f'{{{'",
"f'{{}}{'",
"f'{'",
"f'x{<'", # See bpo-46762.
"f'x{>'",
])

# But these are just normal strings.
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-02-15-20-26-46.bpo-46762.1H7vab.rst
View file
Open in desktop
@@ -0,0 +1,2 @@
Fix an assert failure in debug builds when a '<', '>', or '=' is the last
character in an f-string that's missing a closing right brace.
20 changes: 10 additions & 10 deletions Parser/string_parser.c
View file
Open in desktop
Expand Up @@ -666,12 +666,12 @@ fstring_find_expr(Parser *p, const char **str, const char *end, int raw, int rec
*str += 1;
continue;
}
/* Don't get out of the loop for these, if they're single
chars (not part of 2-char tokens). If by themselves, they
don't end an expression (unlike say '!'). */
if (ch == '>' || ch == '<') {
continue;
}
}
/* Don't get out of the loop for these, if they're single
chars (not part of 2-char tokens). If by themselves, they
don't end an expression (unlike say '!'). */
if (ch == '>' || ch == '<') {
continue;
}

/* Normal way out of this loop. */
Expand All @@ -698,10 +698,10 @@ fstring_find_expr(Parser *p, const char **str, const char *end, int raw, int rec
}
}
expr_end = *str;
/* If we leave this loop in a string or with mismatched parens, we
don't care. We'll get a syntax error when compiling the
expression. But, we can produce a better error message, so
let's just do that.*/
/* If we leave the above loop in a string or with mismatched parens, we
don't really care. We'll get a syntax error when compiling the
expression. But, we can produce a better error message, so let's just
do that.*/
if (quote_char) {
RAISE_SYNTAX_ERROR("f-string: unterminated string");
goto error;
Expand Down