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

Revert previous checkin on getargs 'L' code. Try to convert all

Browse source 
numbers in PyLong_AsLongLong, and update test suite accordingly.
Backported to 2.4.
This commit is contained in:
Martin v. Löwis 2005-03-03 12:26:35 +00:00
parent 4bf108d74f
commit 6ce7ed23d0
4 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Objects/longobject.c
View file

@ -783,9 +783,30 @@ PyLong_AsLongLong(PyObject *vv)
return -1;
}
if (!PyLong_Check(vv)) {
PyNumberMethods *nb;
PyObject *io;
if (PyInt_Check(vv))
return (PY_LONG_LONG)PyInt_AsLong(vv);
PyErr_BadInternalCall();
if ((nb = vv->ob_type->tp_as_number) == NULL ||
nb->nb_int == NULL) {
PyErr_SetString(PyExc_TypeError, "an integer is required");
return -1;
}
io = (*nb->nb_int) (vv);
if (io == NULL)
return -1;
if (PyInt_Check(io)) {
bytes = PyInt_AsLong(io);
Py_DECREF(io);
return bytes;
}
if (PyLong_Check(io)) {
bytes = PyLong_AsLongLong(io);
Py_DECREF(io);
return bytes;
}
Py_DECREF(io);
PyErr_SetString(PyExc_TypeError, "integer conversion failed");
return -1;
}