Ditch obsolete tp_compare implementation.

filmor · filmor · commit b709a4be0866 · 2016-11-23T12:26:52.000+01:00
We can use tp_richcompare for all supported Python versions.
diff --git a/src/runtime/classbase.cs b/src/runtime/classbase.cs
@@ -67,7 +67,7 @@ public virtual IntPtr type_subscript(IntPtr idx)
         //====================================================================
         // Standard comparison implementation for instances of reflected types.
         //====================================================================
-#if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
+
         public static IntPtr tp_richcompare(IntPtr ob, IntPtr other, int op) {
             CLRObject co1;
             CLRObject co2;
@@ -169,27 +169,6 @@ public static IntPtr tp_richcompare(IntPtr ob, IntPtr other, int op) {
                     return Runtime.PyNotImplemented;
             }
         }
-#else
-        public static int tp_compare(IntPtr ob, IntPtr other)
-        {
-            if (ob == other)
-            {
-                return 0;
-            }
-
-            CLRObject co1 = GetManagedObject(ob) as CLRObject;
-            CLRObject co2 = GetManagedObject(other) as CLRObject;
-            Object o1 = co1.inst;
-            Object o2 = co2.inst;
-
-            if (Object.Equals(o1, o2))
-            {
-                return 0;
-            }
-            return -1;
-        }
-#endif
-
 
         //====================================================================
         // Standard iteration support for instances of reflected types. This
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -232,13 +232,13 @@ internal static void Initialize()
             }
 
 #if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
-        IntPtr op = Runtime.PyImport_ImportModule("builtins");
-        IntPtr dict = Runtime.PyObject_GetAttrString(op, "__dict__");
-        PyNotImplemented = Runtime.PyObject_GetAttrString(op, "NotImplemented");
+            IntPtr op = Runtime.PyImport_ImportModule("builtins");
+            IntPtr dict = Runtime.PyObject_GetAttrString(op, "__dict__");
 #else
             IntPtr dict = Runtime.PyImport_GetModuleDict();
             IntPtr op = Runtime.PyDict_GetItemString(dict, "__builtin__");
 #endif
+            PyNotImplemented = Runtime.PyObject_GetAttrString(op, "NotImplemented");
             PyBaseObjectType = Runtime.PyObject_GetAttrString(op, "object");
 
             PyModuleType = Runtime.PyObject_Type(op);
@@ -255,8 +255,8 @@ internal static void Initialize()
             Runtime.XDecref(op);
 
 #if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
-        Runtime.XDecref(dict);
-        Runtime.XDecref(op);
+            Runtime.XDecref(dict);
+            Runtime.XDecref(op);
 #endif
 
             op = Runtime.PyString_FromString("string");
@@ -268,9 +268,9 @@ internal static void Initialize()
             Runtime.XDecref(op);
 
 #if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
-        op = Runtime.PyBytes_FromString("bytes");
-        PyBytesType = Runtime.PyObject_Type(op);
-        Runtime.XDecref(op);
+            op = Runtime.PyBytes_FromString("bytes");
+            PyBytesType = Runtime.PyObject_Type(op);
+            Runtime.XDecref(op);
 #endif
 
             op = Runtime.PyTuple_New(0);
@@ -389,17 +389,18 @@ internal static int AtExit()
         internal static IntPtr PyTypeType;
 
 #if (PYTHON32 || PYTHON33 || PYTHON34 || PYTHON35)
-    internal static IntPtr PyBytesType;
-    internal static IntPtr PyNotImplemented;
-    internal const int Py_LT = 0;
-    internal const int Py_LE = 1;
-    internal const int Py_EQ = 2;
-    internal const int Py_NE = 3;
-    internal const int Py_GT = 4;
-    internal const int Py_GE = 5;
-    internal static IntPtr _PyObject_NextNotImplemented;
+        internal static IntPtr PyBytesType;
+        internal static IntPtr _PyObject_NextNotImplemented;
 #endif
 
+        internal static IntPtr PyNotImplemented;
+        internal const int Py_LT = 0;
+        internal const int Py_LE = 1;
+        internal const int Py_EQ = 2;
+        internal const int Py_NE = 3;
+        internal const int Py_GT = 4;
+        internal const int Py_GE = 5;
+
         internal static IntPtr PyTrue;
         internal static IntPtr PyFalse;
         internal static IntPtr PyNone;
diff --git a/src/tests/test_class.py b/src/tests/test_class.py
@@ -210,39 +210,34 @@ def testComparisons(self):
         self.assertEqual(d1 == d2, False)
         self.assertEqual(d1 != d2, True)
 
-        if six.PY3:
-            self.assertEqual(d1 < d2, True)
-            self.assertEqual(d1 <= d2, True)
-            self.assertEqual(d1 >= d2, False)
-            self.assertEqual(d1 > d2, False)
+        self.assertEqual(d1 < d2, True)
+        self.assertEqual(d1 <= d2, True)
+        self.assertEqual(d1 >= d2, False)
+        self.assertEqual(d1 > d2, False)
 
         self.assertEqual(d1 == d1, True)
         self.assertEqual(d1 != d1, False)
 
-        if six.PY3:
-            self.assertEqual(d1 < d1, False)
-            self.assertEqual(d1 <= d1, True)
-            self.assertEqual(d1 >= d1, True)
-            self.assertEqual(d1 > d1, False)
+        self.assertEqual(d1 < d1, False)
+        self.assertEqual(d1 <= d1, True)
+        self.assertEqual(d1 >= d1, True)
+        self.assertEqual(d1 > d1, False)
 
         self.assertEqual(d2 == d1, False)
         self.assertEqual(d2 != d1, True)
 
-        if six.PY3:
-            self.assertEqual(d2 < d1, False)
-            self.assertEqual(d2 <= d1, False)
-            self.assertEqual(d2 >= d1, True)
-            self.assertEqual(d2 > d1, True)
-
-        if six.PY3:
-            self.assertRaises(TypeError, lambda: d1 < None)
-            self.assertRaises(TypeError, lambda: d1 < System.Guid())
-
-        if six.PY3:
-            # ClassTest does not implement IComparable
-            c1 = ClassTest()
-            c2 = ClassTest()
-            self.assertRaises(TypeError, lambda: c1 < c2)
+        self.assertEqual(d2 < d1, False)
+        self.assertEqual(d2 <= d1, False)
+        self.assertEqual(d2 >= d1, True)
+        self.assertEqual(d2 > d1, True)
+
+        self.assertRaises(TypeError, lambda: d1 < None)
+        self.assertRaises(TypeError, lambda: d1 < System.Guid())
+
+        # ClassTest does not implement IComparable
+        c1 = ClassTest()
+        c2 = ClassTest()
+        self.assertRaises(TypeError, lambda: c1 < c2)
 
 
 class ClassicClass:
