mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Test for issue16772 and redoes the previous fix to accept __index__-aware

Browse source 
objects as the base by using PyNumber_AsSsize_t similar to round().
This commit is contained in:
Gregory P. Smith 2012-12-25 22:38:32 -08:00
parent 83a2aa70af
commit a689e524e7
2 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Objects/longobject.c
View file

@ -4247,8 +4247,7 @@ static PyObject *
long_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
PyObject *obase = NULL, *x = NULL;
long base;
int overflow;
Py_ssize_t base;
static char *kwlist[] = {"x", "base", 0};
if (type != &PyLong_Type)
@ -4266,10 +4265,10 @@ long_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return NULL;
}
base = PyLong_AsLongAndOverflow(obase, &overflow);
base = PyNumber_AsSsize_t(obase, NULL);
if (base == -1 && PyErr_Occurred())
return NULL;
if (overflow || (base != 0 && base < 2) || base > 36) {
if ((base != 0 && base < 2) || base > 36) {
PyErr_SetString(PyExc_ValueError,
"int() arg 2 must be >= 2 and <= 36");
return NULL;