give method and builtin method custom hashCodes

pjenvey · pjenvey · commit b0287f93d772 · 2008-06-08T04:25:33.000Z
fixes #515497
diff --git a/Lib/test/test_func_jy.py b/Lib/test/test_func_jy.py
@@ -30,8 +30,27 @@ def test_functiontype_from_globals(self):
         self.assertEquals(sm_abc(), 789)
 
 
+class MethodHashCodeTestCase(unittest.TestCase):
+
+    def test_builtin_method_hashcode(self):
+        foo = 'foo'
+        self.assert_(foo.title is not foo.title)
+        self.assertEqual(hash(foo.title), hash(foo.title))
+        self.assertNotEqual(hash(foo.title), hash('bar'.title))
+
+    def test_method_hashcode(self):
+        class Foo(object):
+            def bar(self):
+                pass
+        foo = Foo()
+        self.assert_(foo.bar is not foo.bar)
+        self.assertEqual(hash(foo.bar), hash(foo.bar))
+        self.assertNotEqual(hash(foo.bar), hash(Foo().bar))
+
+
 def test_main():
-    test_support.run_unittest(FunctionTypeTestCase)
+    test_support.run_unittest(FunctionTypeTestCase,
+                              MethodHashCodeTestCase)
 
 if __name__ == '__main__':
     test_main()
diff --git a/src/org/python/core/PyBuiltinMethod.java b/src/org/python/core/PyBuiltinMethod.java
@@ -2,13 +2,15 @@
 
 import org.python.expose.ExposeAsSuperclass;
 
-
 public abstract class PyBuiltinMethod extends PyBuiltinFunction implements ExposeAsSuperclass  {
 
+    protected PyObject self;
+
     protected PyBuiltinMethod(PyType type, PyObject self, Info info) {
         super(type, info);
         this.self = self;
     }
+
     protected PyBuiltinMethod(PyObject self, Info info) {
         super(info);
         this.self = self;
@@ -26,5 +28,9 @@ public PyMethodDescr makeDescriptor(PyType t) {
         return new PyMethodDescr(t, this);
     }
 
-    protected PyObject self;
+    @Override
+    public int hashCode() {
+        int hashCode = self == null ? 0 : self.hashCode();
+        return hashCode ^ getClass().hashCode();
+    }
 }
diff --git a/src/org/python/core/PyMethod.java b/src/org/python/core/PyMethod.java
@@ -136,6 +136,12 @@ final int instancemethod___cmp__(PyObject other) {
         return 0;
     }
 
+    @Override
+    public int hashCode() {
+        int hashCode = im_self == null ? Py.None.hashCode() : im_self.hashCode();
+        return hashCode ^ im_func.hashCode();
+    }
+
     @Override
     public PyObject getDoc() {
         return im_func.getDoc();
