Rich comparisons fall-out:
- Get rid of float_cmp().
- Renamed Py_TPFLAGS_NEWSTYLENUMBER to Py_TPFLAGS_CHECKTYPES.
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index 3e87903..5e646b9 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -346,16 +346,6 @@
return (i < j) ? -1 : (i > j) ? 1 : 0;
}
-/* Needed for the new style number compare slots */
-static PyObject *
-float_cmp(PyObject *v, PyObject *w)
-{
- double a,b;
- CONVERT_TO_DOUBLE(v, a);
- CONVERT_TO_DOUBLE(w, b);
- return PyInt_FromLong((a < b) ? -1 : (a > b) ? 1 : 0);
-}
-
static long
float_hash(PyFloatObject *v)
{
@@ -670,9 +660,6 @@
0, /*nb_inplace_and*/
0, /*nb_inplace_xor*/
0, /*nb_inplace_or*/
-
- /* New style slots: */
- (binaryfunc)float_cmp, /*nb_cmp*/
};
PyTypeObject PyFloat_Type = {
@@ -696,7 +683,7 @@
0, /*tp_getattro*/
0, /*tp_setattro*/
0, /*tp_as_buffer*/
- Py_TPFLAGS_NEWSTYLENUMBER /*tp_flags*/
+ Py_TPFLAGS_CHECKTYPES /*tp_flags*/
};
void