mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

gh-93283: Improve error message for f-string with invalid conversion character (GH-93349)

Browse source
This commit is contained in:
Serhiy Storchaka 2022-05-31 20:38:29 +03:00 • committed by GitHub
parent bb900712a5
commit 07df8d5b2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Parser/string_parser.c
View file

@ -767,27 +767,43 @@ fstring_find_expr(Parser *p, const char **str, const char *end, int raw, int rec
/* Check for a conversion char, if present. */
if (**str == '!') {
*str += 1;
if (*str >= end) {
goto unexpected_end_of_string;
const char *conv_start = *str;
while (1) {
if (*str >= end) {
goto unexpected_end_of_string;
}
if (**str == '}' || **str == ':') {
break;
}
*str += 1;
}
if (*str == conv_start) {
RAISE_SYNTAX_ERROR(
"f-string: missed conversion character");
goto error;
}
conversion = (unsigned char)**str;
*str += 1;
conversion = (unsigned char)*conv_start;
/* Validate the conversion. */
if (!(conversion == 's' || conversion == 'r' || conversion == 'a')) {
RAISE_SYNTAX_ERROR(
"f-string: invalid conversion character: "
"expected 's', 'r', or 'a'");
if ((*str != conv_start + 1) ||
!(conversion == 's' || conversion == 'r' || conversion == 'a'))
{
PyObject *conv_obj = PyUnicode_FromStringAndSize(conv_start,
*str-conv_start);
if (conv_obj) {
RAISE_SYNTAX_ERROR(
"f-string: invalid conversion character %R: "
"expected 's', 'r', or 'a'",
conv_obj);
Py_DECREF(conv_obj);
}
goto error;
}
}
/* Check for the format spec, if present. */
if (*str >= end) {
goto unexpected_end_of_string;
}
assert(*str < end);
if (**str == ':') {
*str += 1;
if (*str >= end) {