Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 15:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes issue #16772: int() constructor second argument (base) must be an int.

Browse source 
Consistent with the behavior in Python 2.
This commit is contained in:
Gregory P. Smith 2012-12-25 13:05:31 -08:00
parent 6d469ebbc8
commit 4fbbf8c0a3
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
Core and Builtins
-----------------
- Issue #16772: The int() constructor's second argument (base) no longer
accepts non integer values. Consistent with the behavior in Python 2.
- Issue #15422: Get rid of PyCFunction_New macro. Use PyCFunction_NewEx
function (PyCFunction_New func is still present for backward compatibility).

5
Objects/longobject.c
View file

@ -4260,6 +4260,11 @@ long_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return PyLong_FromLong(0L);
if (obase == NULL)
return PyNumber_Long(x);
if (!PyLong_Check(obase)) {
PyErr_SetString(PyExc_TypeError,
"int() arg 2 must be an integer.");
return NULL;
}
base = PyLong_AsLongAndOverflow(obase, &overflow);
if (base == -1 && PyErr_Occurred())