Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Lib/test/test_fstring.py
View File

@ -590,7 +590,9 @@ x = (
self.assertEqual(f'{-10:{"-"}#{1}0{"x"}}', ' -0xa')
self.assertEqual(f'{10:#{3 != {4:5} and width}x}', ' 0xa')
self.assertAllRaise(SyntaxError, "f-string: expecting '}'",
self.assertAllRaise(SyntaxError,
"""f-string: invalid conversion character 'r{"': """
"""expected 's', 'r', or 'a'""",
["""f'{"s"!r{":10"}}'""",
# This looks like a nested format spec.
@ -1012,19 +1014,28 @@ x = (
# Not a conversion, but show that ! is allowed in a format spec.
self.assertEqual(f'{3.14:!<10.10}', '3.14!!!!!!')
self.assertAllRaise(SyntaxError, 'f-string: invalid conversion character',
["f'{3!g}'",
"f'{3!A}'",
"f'{3!3}'",
"f'{3!G}'",
"f'{3!!}'",
"f'{3!:}'",
"f'{3! s}'", # no space before conversion char
self.assertAllRaise(SyntaxError, "f-string: expecting '}'",
["f'{3!'",
"f'{3!s'",
"f'{3!g'",
])
self.assertAllRaise(SyntaxError, "f-string: expecting '}'",
["f'{x!s{y}}'",
"f'{3!ss}'",
self.assertAllRaise(SyntaxError, 'f-string: missed conversion character',
["f'{3!}'",
"f'{3!:'",
"f'{3!:}'",
])
for conv in 'g', 'A', '3', 'G', '!', ' s', 's ', ' s ', 'ä', 'ɐ', 'ª':
self.assertAllRaise(SyntaxError,
"f-string: invalid conversion character %r: "
"expected 's', 'r', or 'a'" % conv,
["f'{3!" + conv + "}'"])
self.assertAllRaise(SyntaxError,
"f-string: invalid conversion character 'ss': "
"expected 's', 'r', or 'a'",
["f'{3!ss}'",
"f'{3!ss:}'",
"f'{3!ss:s}'",
])

2
Misc/NEWS.d/next/Core and Builtins/2022-05-30-14-50-03.gh-issue-93283.XDO2ZQ.rst Normal file
View File

@ -0,0 +1,2 @@
Improve error message for invalid syntax of conversion character in f-string
expressions.

36
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;
const char *conv_start = *str;
while (1) {
if (*str >= end) {
goto unexpected_end_of_string;
}
conversion = (unsigned char)**str;
if (**str == '}' || **str == ':') {
break;
}
*str += 1;
/* Validate the conversion. */
if (!(conversion == 's' || conversion == 'r' || conversion == 'a')) {
}
if (*str == conv_start) {
RAISE_SYNTAX_ERROR(
"f-string: invalid conversion character: "
"expected 's', 'r', or 'a'");
"f-string: missed conversion character");
goto error;
}
conversion = (unsigned char)*conv_start;
/* Validate the conversion. */
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) {