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

Require that __nonzero__() return a bool or exactly an int.

Browse source
This commit is contained in:
Jeremy Hylton 2003-06-27 17:38:27 +00:00
parent 25b5358cf2
commit 3e3159ce6a
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Objects/typeobject.c
View file

@ -4196,18 +4196,14 @@ slot_nb_nonzero(PyObject *self)
PyObject *temp = PyObject_Call(func, args, NULL);
Py_DECREF(args);
if (temp != NULL) {
if (PyInt_Check(temp)) {
/* XXX need to guard against recursion here */
result = PyObject_IsTrue(temp);
}
else if (PyBool_Check(temp))
if (PyInt_CheckExact(temp) || PyBool_Check(temp))
result = PyObject_IsTrue(temp);
else {
PyErr_Format(PyExc_TypeError,
"__nonzero__ should return "
"bool or int, returned %s",
temp->ob_type->tp_name);
result = NULL;
result = -1;
}
Py_DECREF(temp);
}