Rich comparisons fall-out:
- Renamed Py_TPFLAGS_NEWSTYLENUMBER to Py_TPFLAGS_CHECKTYPES.
- Use PyObject_RichCompareBool() in PySequence_Contains().
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 9050a4c..1189ae8 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -6,7 +6,7 @@
#include "structmember.h" /* we need the offsetof() macro from there */
#define NEW_STYLE_NUMBER(o) PyType_HasFeature((o)->ob_type, \
- Py_TPFLAGS_NEWSTYLENUMBER)
+ Py_TPFLAGS_CHECKTYPES)
/* Shorthands to return certain errors */
@@ -1363,11 +1363,11 @@
}
return -1;
}
- cmp = PyObject_Compare(v, x);
+ cmp = PyObject_RichCompareBool(v, x, Py_EQ);
Py_XDECREF(x);
- if (cmp == 0)
+ if (cmp > 0)
return 1;
- if (PyErr_Occurred())
+ if (cmp < 0)
return -1;
}