mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-24 20:30:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

gh-117557: Improve error messages when a string, bytes or bytearray of length 1 are expected (GH-117631)

Browse source
This commit is contained in:
Serhiy Storchaka 2024-05-28 12:01:37 +03:00 • committed by GitHub
parent bf08f0a5fe
commit b313cc68d5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 811 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Objects/bytesobject.c
View file

@ -477,21 +477,32 @@ formatlong(PyObject *v, int flags, int prec, int type)
static int
byte_converter(PyObject *arg, char *p)
{
if (PyBytes_Check(arg) && PyBytes_GET_SIZE(arg) == 1) {
if (PyBytes_Check(arg)) {
if (PyBytes_GET_SIZE(arg) != 1) {
PyErr_Format(PyExc_TypeError,
"%%c requires an integer in range(256) or "
"a single byte, not a bytes object of length %zd",
PyBytes_GET_SIZE(arg));
return 0;
}
*p = PyBytes_AS_STRING(arg)[0];
return 1;
}
else if (PyByteArray_Check(arg) && PyByteArray_GET_SIZE(arg) == 1) {
else if (PyByteArray_Check(arg)) {
if (PyByteArray_GET_SIZE(arg) != 1) {
PyErr_Format(PyExc_TypeError,
"%%c requires an integer in range(256) or "
"a single byte, not a bytearray object of length %zd",
PyByteArray_GET_SIZE(arg));
return 0;
}
*p = PyByteArray_AS_STRING(arg)[0];
return 1;
}
else {
else if (PyIndex_Check(arg)) {
int overflow;
long ival = PyLong_AsLongAndOverflow(arg, &overflow);
if (ival == -1 && PyErr_Occurred()) {
if (PyErr_ExceptionMatches(PyExc_TypeError)) {
goto onError;
}
return 0;
}
if (!(0 <= ival && ival <= 255)) {
@ -503,9 +514,9 @@ byte_converter(PyObject *arg, char *p)
*p = (char)ival;
return 1;
}
onError:
PyErr_SetString(PyExc_TypeError,
"%c requires an integer in range(256) or a single byte");
PyErr_Format(PyExc_TypeError,
"%%c requires an integer in range(256) or a single byte, not %T",
arg);
return 0;
}