mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Do the same thing to complex that I did to str: the rich comparison

Browse source 
function returns NotImplemented when comparing objects whose
tp_richcompare slot is not itself.
This commit is contained in:
Guido van Rossum 2001-09-24 17:52:04 +00:00
parent e47df7a211
commit 2205642fe0
2 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Objects/complexobject.c
View file

@ -553,12 +553,6 @@ complex_richcompare(PyObject *v, PyObject *w, int op)
Py_complex i, j;
PyObject *res;
if (op != Py_EQ && op != Py_NE) {
PyErr_SetString(PyExc_TypeError,
"cannot compare complex numbers using <, <=, >, >=");
return NULL;
}
c = PyNumber_CoerceEx(&v, &w);
if (c < 0)
return NULL;
@ -566,7 +560,10 @@ complex_richcompare(PyObject *v, PyObject *w, int op)
Py_INCREF(Py_NotImplemented);
return Py_NotImplemented;
}
if (!PyComplex_Check(v) || !PyComplex_Check(w)) {
/* May sure both arguments use complex comparison.
This implies PyComplex_Check(a) && PyComplex_Check(b). */
if (v->ob_type->tp_richcompare != complex_richcompare ||
w->ob_type->tp_richcompare != complex_richcompare) {
Py_DECREF(v);
Py_DECREF(w);
Py_INCREF(Py_NotImplemented);
@ -578,6 +575,12 @@ complex_richcompare(PyObject *v, PyObject *w, int op)
Py_DECREF(v);
Py_DECREF(w);
if (op != Py_EQ && op != Py_NE) {
PyErr_SetString(PyExc_TypeError,
"cannot compare complex numbers using <, <=, >, >=");
return NULL;
}
if ((i.real == j.real && i.imag == j.imag) == (op == Py_EQ))
res = Py_True;
else