Fix for Python3, and add Oid cmp tests

jdavid · jdavid · commit bd54d281570c · 2013-04-14T13:50:09.000+02:00
diff --git a/src/oid.c b/src/oid.c
@@ -179,10 +179,31 @@ Oid_init(Oid *self, PyObject *args, PyObject *kw)
 }
 
 
-int
-Oid_compare(PyObject *o1, PyObject *o2)
+PyObject *
+Oid_richcompare(PyObject *o1, PyObject *o2, int op)
 {
-    return git_oid_cmp(&((Oid*)o1)->oid, &((Oid*)o2)->oid);
+    PyObject *res;
+
+    /* Support only equual (and not-equal). */
+    if (op != Py_EQ && op != Py_NE) {
+        PyErr_SetNone(PyExc_TypeError);
+        return NULL;
+    }
+
+    /* Comparing to something else than an Oid is not supported. */
+    if (!PyObject_TypeCheck(o2, &OidType)) {
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    }
+
+    /* Ok go. */
+    if (git_oid_cmp(&((Oid*)o1)->oid, &((Oid*)o2)->oid) == 0)
+        res = (op == Py_EQ) ? Py_True : Py_False;
+    else
+        res = (op == Py_EQ) ? Py_False : Py_True;
+
+    Py_INCREF(res);
+    return res;
 }
 
 
@@ -220,7 +241,7 @@ PyTypeObject OidType = {
     0,                                         /* tp_print          */
     0,                                         /* tp_getattr        */
     0,                                         /* tp_setattr        */
-    (cmpfunc)Oid_compare,                      /* tp_compare        */
+    0,                                         /* tp_compare        */
     0,                                         /* tp_repr           */
     0,                                         /* tp_as_number      */
     0,                                         /* tp_as_sequence    */
@@ -235,7 +256,7 @@ PyTypeObject OidType = {
     Oid__doc__,                                /* tp_doc            */
     0,                                         /* tp_traverse       */
     0,                                         /* tp_clear          */
-    0,                                         /* tp_richcompare    */
+    (richcmpfunc)Oid_richcompare,              /* tp_richcompare    */
     0,                                         /* tp_weaklistoffset */
     0,                                         /* tp_iter           */
     0,                                         /* tp_iternext       */
diff --git a/test/test_oid.py b/test/test_oid.py
@@ -67,12 +67,21 @@ def test_long(self):
 
     def test_cmp(self):
         oid1 = Oid(raw=RAW)
+
+        # Equal
         oid2 = Oid(hex=HEX)
         self.assertEqual(oid1, oid2)
 
+        # Not equal
         oid2 = Oid(hex="15b648aec6ed045b5ca6f57f8b7831a8b4757299")
         self.assertNotEqual(oid1, oid2)
 
+        # Other
+        with self.assertRaises(TypeError): oid1 < oid2
+        with self.assertRaises(TypeError): oid1 <= oid2
+        with self.assertRaises(TypeError): oid1 > oid2
+        with self.assertRaises(TypeError): oid1 >= oid2
+
 
 if __name__ == '__main__':
     unittest.main()
