traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

closes bpo-34868: Improve error message with '_' is combined with an invalid type specifier. (GH-9666)

This commit is contained in:
Benjamin Peterson 2018-10-01 21:54:39 -07:00 committed by GitHub
parent 30534cc717
commit cbda8fc5d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_long.py
View File

@ -700,6 +700,9 @@ class LongTest(unittest.TestCase):
self.assertRaisesRegex(ValueError, 'Cannot specify both', format, 3, '_,d')
self.assertRaisesRegex(ValueError, 'Cannot specify both', format, 3, ',_d')
self.assertRaisesRegex(ValueError, "Cannot specify ',' with 's'", format, 3, ',s')
self.assertRaisesRegex(ValueError, "Cannot specify '_' with 's'", format, 3, '_s')
# ensure that only int and float type specifiers work
for format_spec in ([chr(x) for x in range(ord('a'), ord('z')+1)] +
[chr(x) for x in range(ord('A'), ord('Z')+1)]):

17
Python/formatter_unicode.c
View File

@ -28,16 +28,17 @@ unknown_presentation_type(Py_UCS4 presentation_type,
}
static void
invalid_comma_type(Py_UCS4 presentation_type)
invalid_thousands_separator_type(char specifier, Py_UCS4 presentation_type)
{
assert(specifier == ',' || specifier == '_');
if (presentation_type > 32 && presentation_type < 128)
PyErr_Format(PyExc_ValueError,
"Cannot specify ',' with '%c'.",
(char)presentation_type);
"Cannot specify '%c' with '%c'.",
specifier, (char)presentation_type);
else
PyErr_Format(PyExc_ValueError,
"Cannot specify ',' with '\\x%x'.",
(unsigned int)presentation_type);
"Cannot specify '%c' with '\\x%x'.",
specifier, (unsigned int)presentation_type);
}
static void
@ -117,8 +118,8 @@ is_sign_element(Py_UCS4 c)
/* Locale type codes. LT_NO_LOCALE must be zero. */
enum LocaleType {
LT_NO_LOCALE = 0,
LT_DEFAULT_LOCALE,
LT_UNDERSCORE_LOCALE,
LT_DEFAULT_LOCALE = ',',
LT_UNDERSCORE_LOCALE = '_',
LT_UNDER_FOUR_LOCALE,
LT_CURRENT_LOCALE
};
@ -314,7 +315,7 @@ parse_internal_render_format_spec(PyObject *format_spec,
}
/* fall through */
default:
invalid_comma_type(format->type);
invalid_thousands_separator_type(format->thousands_separators, format->type);
return 0;
}
}