mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Issue #17715: Merge fix from 3.3.

Browse source
This commit is contained in:
Mark Dickinson 2013-04-13 17:46:04 +01:00
commit 93196eb44f
3 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Objects/abstract.c
View file

@ -1314,6 +1314,8 @@ PyNumber_Long(PyObject *o)
PyObject *truncated = PyEval_CallObject(trunc_func, NULL);
PyObject *int_instance;
Py_DECREF(trunc_func);
if (truncated == NULL)
return NULL;
/* __trunc__ is specified to return an Integral type,
but int() needs to return a int. */
int_instance = convert_integral_to_int(truncated,