mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-16 07:45:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue19995: more informative error message; spelling corrections; use operator.mod instead of __mod__

Browse source
This commit is contained in:
Ethan Furman 2014-03-21 06:38:46 -07:00
parent a17d678098
commit 9ab748013b
2 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Objects/unicodeobject.c
View file

@ -13986,11 +13986,13 @@ mainformatlong(PyObject *v,
if (!PyNumber_Check(v))
goto wrongtype;
/* make sure number is a type of integer */
/* make sure number is a type of integer for o, x, and X */
if (!PyLong_Check(v)) {
if (type == 'o' || type == 'x' || type == 'X') {
iobj = PyNumber_Index(v);
if (iobj == NULL) {
if (PyErr_ExceptionMatches(PyExc_TypeError))
goto wrongtype;
return -1;
}
}
@ -14052,10 +14054,23 @@ mainformatlong(PyObject *v,
return 0;
wrongtype:
PyErr_Format(PyExc_TypeError,
"%%%c format: a number is required, "
"not %.200s",
type, Py_TYPE(v)->tp_name);
switch(type)
{
case 'o':
case 'x':
case 'X':
PyErr_Format(PyExc_TypeError,
"%%%c format: an integer is required, "
"not %.200s",
type, Py_TYPE(v)->tp_name);
break;
default:
PyErr_Format(PyExc_TypeError,
"%%%c format: a number is required, "
"not %.200s",
type, Py_TYPE(v)->tp_name);
break;
}
return -1;
}