traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

correctly lookup __trunc__ in int() constructor

This commit is contained in:
Benjamin Peterson 2012-03-20 23:48:11 -04:00
parent 9fc9bf465a
commit 1b1a8e7cb5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/test/test_descr.py
View File

@ -1770,6 +1770,7 @@ order (MRO) for bases """
("__format__", format, format_impl, set(), {}),
("__floor__", math.floor, zero, set(), {}),
("__trunc__", math.trunc, zero, set(), {}),
("__trunc__", int, zero, set(), {}),
("__ceil__", math.ceil, zero, set(), {}),
("__dir__", dir, empty_seq, set(), {}),
]

5
Objects/abstract.c
View File

@ -1350,7 +1350,7 @@ PyNumber_Long(PyObject *o)
}
if (PyLong_Check(o)) /* An int subclass without nb_int */
return _PyLong_Copy((PyLongObject *)o);
trunc_func = _PyObject_GetAttrId(o, &PyId___trunc__);
trunc_func = _PyObject_LookupSpecial(o, &PyId___trunc__);
if (trunc_func) {
PyObject *truncated = PyEval_CallObject(trunc_func, NULL);
PyObject *int_instance;
@ -1362,7 +1362,8 @@ PyNumber_Long(PyObject *o)
"__trunc__ returned non-Integral (type %.200s)");
return int_instance;
}
PyErr_Clear(); /* It's not an error if o.__trunc__ doesn't exist. */
if (PyErr_Occurred())
return NULL;
if (PyBytes_Check(o))
/* need to do extra error checking that PyLong_FromString()