diff options
| author | Raymond Hettinger <python@rcn.com> | 2003-10-12 23:41:21 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2003-10-12 23:41:21 (GMT) |
| commit | 5307bc50ea13c080ba714ea1a8a8ac1448ed6f95 (patch) | |
| tree | 2e08a832f78871bfbf7f49138e709cd4869526de | |
| parent | f28980ef37635a464b21446fabff39366fe7d73b (diff) | |
| download | cpython-5307bc50ea13c080ba714ea1a8a8ac1448ed6f95.zip cpython-5307bc50ea13c080ba714ea1a8a8ac1448ed6f95.tar.gz cpython-5307bc50ea13c080ba714ea1a8a8ac1448ed6f95.tar.bz2 | |
Backport fix to SF bug #820397: __nonzero__() returns 1/0
| -rw-r--r-- | Objects/typeobject.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index b07ce2e..2d8b9db 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -3312,6 +3312,20 @@ wrap_inquiry(PyObject *self, PyObject *args, void *wrapped) } static PyObject * +wrap_inquirypred(PyObject *self, PyObject *args, void *wrapped) +{ + inquiry func = (inquiry)wrapped; + int res; + + if (!PyArg_ParseTuple(args, "")) + return NULL; + res = (*func)(self); + if (res == -1 && PyErr_Occurred()) + return NULL; + return PyBool_FromLong((long)res); +} + +static PyObject * wrap_binaryfunc(PyObject *self, PyObject *args, void *wrapped) { binaryfunc func = (binaryfunc)wrapped; @@ -4900,7 +4914,7 @@ static slotdef slotdefs[] = { UNSLOT("__pos__", nb_positive, slot_nb_positive, wrap_unaryfunc, "+x"), UNSLOT("__abs__", nb_absolute, slot_nb_absolute, wrap_unaryfunc, "abs(x)"), - UNSLOT("__nonzero__", nb_nonzero, slot_nb_nonzero, wrap_inquiry, + UNSLOT("__nonzero__", nb_nonzero, slot_nb_nonzero, wrap_inquirypred, "x != 0"), UNSLOT("__invert__", nb_invert, slot_nb_invert, wrap_unaryfunc, "~x"), BINSLOT("__lshift__", nb_lshift, slot_nb_lshift, "<<"), |