mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue 2440: fix the handling of %n in Python/getargs.c's convertsimple(), extend Objects/abstract.c's PyNumber_Index() to accept PyObjects that have nb_int slots, and update test_getargs2 to test that an exception is thrown when __int__() returns a non-int object.

Browse source
This commit is contained in:
Trent Nelson 2008-04-10 16:25:37 +00:00
parent 5680d0c5e3
commit e2ae4684a5
3 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Objects/abstract.c
View file

@ -1220,6 +1220,7 @@ PyNumber_Absolute(PyObject *o)
PyObject *
PyNumber_Index(PyObject *item)
{
PyNumberMethods *m;
PyObject *result = NULL;
if (item == NULL)
return null_error();
@ -1227,8 +1228,9 @@ PyNumber_Index(PyObject *item)
Py_INCREF(item);
return item;
}
m = item->ob_type->tp_as_number;
if (PyIndex_Check(item)) {
result = item->ob_type->tp_as_number->nb_index(item);
result = m->nb_index(item);
if (result && !PyLong_Check(result)) {
PyErr_Format(PyExc_TypeError,
"__index__ returned non-int "
@ -1238,7 +1240,17 @@ PyNumber_Index(PyObject *item)
return NULL;
}
}
else {
else if (m && m->nb_int != NULL) {
result = m->nb_int(item);
if (result && !PyLong_Check(result)) {
PyErr_Format(PyExc_TypeError,
"__int__ returned non-int "
"(type %.200s)",
result->ob_type->tp_name);
Py_DECREF(result);
return NULL;
}
} else {
PyErr_Format(PyExc_TypeError,
"'%.200s' object cannot be interpreted "
"as an integer", item->ob_type->tp_name);