Rich comparisons fall-out:
- Get rid of int_cmp().
- Renamed Py_TPFLAGS_NEWSTYLENUMBER to Py_TPFLAGS_CHECKTYPES.
diff --git a/Objects/intobject.c b/Objects/intobject.c
index c51eda0..72d5323 100644
--- a/Objects/intobject.c
+++ b/Objects/intobject.c
@@ -257,16 +257,6 @@
return (i < j) ? -1 : (i > j) ? 1 : 0;
}
-/* Needed for the new style number compare slots */
-static PyObject *
-int_cmp(PyObject *v, PyObject *w)
-{
- register long a, b;
- CONVERT_TO_LONG(v, a);
- CONVERT_TO_LONG(w, b);
- return PyInt_FromLong((a < b) ? -1 : (a > b) ? 1 : 0);
-}
-
static long
int_hash(PyIntObject *v)
{
@@ -795,9 +785,6 @@
0, /*nb_inplace_and*/
0, /*nb_inplace_xor*/
0, /*nb_inplace_or*/
-
- /* New style slots: */
- (binaryfunc)int_cmp, /*nb_cmp*/
};
PyTypeObject PyInt_Type = {
@@ -821,7 +808,7 @@
0, /*tp_getattro*/
0, /*tp_setattro*/
0, /*tp_as_buffer*/
- Py_TPFLAGS_NEWSTYLENUMBER /*tp_flags*/
+ Py_TPFLAGS_CHECKTYPES /*tp_flags*/
};
void