allow comparison of builtin methods, fixes test_descr.methodwrapper minus its

pjenvey · pjenvey · commit 0aaa3c78e127 · 2009-04-06T02:35:31.000Z
implementation detail
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
@@ -4199,7 +4199,10 @@ def methodwrapper():
     verify(l.__add__ != l.__mul__)
     verify(l.__add__.__name__ == '__add__')
     verify(l.__add__.__self__ is l)
-    verify(l.__add__.__objclass__ is list)
+    if not is_jython:
+        # XXX: method-wrapper implementation detail, not all builtin
+        # instance methods have __objclass__ (e.g. l.append)
+        verify(l.__add__.__objclass__ is list)
     vereq(l.__add__.__doc__, list.__add__.__doc__)
     try:
         hash(l.__add__)
@@ -4419,10 +4422,6 @@ def test_main():
             # Lack __basicsize__: http://bugs.jython.org/issue1017
             slotmultipleinheritance,
 
-            # Jython lacks CPython method-wrappers (though maybe this
-            # should pass anyway?)
-            methodwrapper,
-
             # derived classes don't support coerce:
             # http://bugs.jython.org/issue1060
             notimplemented
diff --git a/src/org/python/core/PyBuiltinMethod.java b/src/org/python/core/PyBuiltinMethod.java
@@ -50,4 +50,25 @@ public int hashCode() {
         int hashCode = self == null ? 0 : self.hashCode();
         return hashCode ^ getClass().hashCode();
     }
+
+    @Override
+    public int __cmp__(PyObject other) {
+        if (!(other instanceof PyBuiltinMethod)) {
+            return -2;
+        }
+        PyBuiltinMethod otherMethod = (PyBuiltinMethod)other;
+        if (self != otherMethod.self) {
+            if (self == null) {
+                return -1;
+            } else if (otherMethod.self == null) {
+                return 1;
+            }
+            return self._cmp(otherMethod.self);
+        }
+        if (getClass() == otherMethod.getClass()) {
+            return 0;
+        }
+        int compareTo = info.getName().compareTo(otherMethod.info.getName());
+        return compareTo < 0 ? -1 : compareTo > 0 ? 1 : 0;
+    }
 }
