diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2015-01-26 08:04:15 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-01-26 08:04:15 (GMT) |
| commit | 34af5023fc1e74c2d6a7537a11148885c84d9cb4 (patch) | |
| tree | 7d0798f2543f647ac94acef12bd9ebc71fe6dd29 /Objects | |
| parent | 4e1942bcd8a3904047bf96a16305f0e1e4736b5c (diff) | |
| parent | f4b7a02e932671c6e54e6b48340173cc859ab4c0 (diff) | |
| download | cpython-34af5023fc1e74c2d6a7537a11148885c84d9cb4.zip cpython-34af5023fc1e74c2d6a7537a11148885c84d9cb4.tar.gz cpython-34af5023fc1e74c2d6a7537a11148885c84d9cb4.tar.bz2 | |
Issue #21408: The default __ne__() now returns NotImplemented if __eq__()
returned NotImplemented. Removed incorrect implementations of __ne__().
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/typeobject.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index dd8a940..a1b2cb7 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -3385,9 +3385,14 @@ object_richcompare(PyObject *self, PyObject *other, int op) break; case Py_NE: - /* By default, != returns the opposite of ==, + /* By default, __ne__() delegates to __eq__() and inverts the result, unless the latter returns NotImplemented. */ - res = PyObject_RichCompare(self, other, Py_EQ); + if (self->ob_type->tp_richcompare == NULL) { + res = Py_NotImplemented; + Py_INCREF(res); + break; + } + res = (*self->ob_type->tp_richcompare)(self, other, Py_EQ); if (res != NULL && res != Py_NotImplemented) { int ok = PyObject_IsTrue(res); Py_DECREF(res); |