Make weakref proxies delegate comparison operators (#710)

* Make weakref proxies delegate comparison operators

Add slots for all comparison operators which delegate to the object
being proxied.

* Remove EqualsWorker()

Author: gfmcknight

Src/IronPython.Modules/_weakref.Generated.cs

@@ -57,7 +57,12 @@ public sealed partial class weakproxy {
 
             #endregion
 
-            //[SlotField] public static PythonTypeSlot __cmp__ = new SlotWrapper(Symbols.Cmp, ProxyType);
+            [SlotField] public static PythonTypeSlot __eq__ = new SlotWrapper("__eq__", ProxyType);
+            [SlotField] public static PythonTypeSlot __ne__ = new SlotWrapper("__ne__", ProxyType);
+            [SlotField] public static PythonTypeSlot __lt__ = new SlotWrapper("__lt__", ProxyType);
+            [SlotField] public static PythonTypeSlot __gt__ = new SlotWrapper("__gt__", ProxyType);
+            [SlotField] public static PythonTypeSlot __le__ = new SlotWrapper("__le__", ProxyType);
+            [SlotField] public static PythonTypeSlot __ge__ = new SlotWrapper("__ge__", ProxyType);
             [SlotField] public static PythonTypeSlot __divmod__ = new SlotWrapper("__divmod__", ProxyType);
             [SlotField] public static PythonTypeSlot __float__ = new SlotWrapper("__float__", ProxyType);
             [SlotField] public static PythonTypeSlot __index__ = new SlotWrapper("__index__", ProxyType);
@@ -126,7 +131,12 @@ public sealed partial class weakcallableproxy {
 
             #endregion
 
-            //[SlotField] public static PythonTypeSlot __cmp__ = new SlotWrapper(Symbols.Cmp, CallableProxyType);
+            [SlotField] public static PythonTypeSlot __eq__ = new SlotWrapper("__eq__", CallableProxyType);
+            [SlotField] public static PythonTypeSlot __ne__ = new SlotWrapper("__ne__", CallableProxyType);
+            [SlotField] public static PythonTypeSlot __lt__ = new SlotWrapper("__lt__", CallableProxyType);
+            [SlotField] public static PythonTypeSlot __gt__ = new SlotWrapper("__gt__", CallableProxyType);
+            [SlotField] public static PythonTypeSlot __le__ = new SlotWrapper("__le__", CallableProxyType);
+            [SlotField] public static PythonTypeSlot __ge__ = new SlotWrapper("__ge__", CallableProxyType);
             [SlotField] public static PythonTypeSlot __divmod__ = new SlotWrapper("__divmod__", CallableProxyType);
             [SlotField] public static PythonTypeSlot __float__ = new SlotWrapper("__float__", CallableProxyType);
             [SlotField] public static PythonTypeSlot __index__ = new SlotWrapper("__index__", CallableProxyType);

Src/IronPython.Modules/_weakref.cs

@@ -446,27 +446,6 @@ object IProxyObject.Target {
 
             public const object __hash__ = null;
 
-            private bool EqualsWorker(weakproxy other) {
-                return PythonOps.EqualRetBool(_context, GetObject(), other.GetObject());
-            }
-
-            /// <summary>
-            /// Special equality function because IStructuralEquatable.Equals is not allowed to throw.
-            /// </summary>
-            [return: MaybeNotImplemented]
-            public object __eq__(object other) {
-                if (!(other is weakproxy)) return NotImplementedType.Value;
-
-                return ScriptingRuntimeHelpers.BooleanToObject(EqualsWorker((weakproxy)other));
-            }
-
-            [return: MaybeNotImplemented]
-            public object __ne__(object other) {
-                if (!(other is weakproxy)) return NotImplementedType.Value;
-
-                return ScriptingRuntimeHelpers.BooleanToObject(!EqualsWorker((weakproxy)other));
-            }
-
             int IStructuralEquatable.GetHashCode(IEqualityComparer comparer) {
                 object obj;
                 if (TryGetObject(out obj)) {
@@ -705,20 +684,6 @@ object IProxyObject.Target {
 
             public const object __hash__ = null;
 
-            /// <summary>
-            /// Special equality function because IStructuralEquatable.Equals is not allowed to throw.
-            /// </summary>
-            public bool __eq__(object other) {
-                weakcallableproxy wrp = other as weakcallableproxy;
-                if (wrp != null) return GetObject().Equals(wrp.GetObject());
-
-                return PythonOps.EqualRetBool(_context, GetObject(), other);
-            }
-
-            public bool __ne__(object other) {
-                return !__eq__(other);
-            }
-
             int IStructuralEquatable.GetHashCode(IEqualityComparer comparer) {
                 object obj;
                 if (TryGetObject(out obj)) {

Tests/modules/misc/test__weakref.py

@@ -137,12 +137,10 @@ def __eq__(self, *args, **kwargs): return True
         x, y = helper_func()
         gc.collect()
 
-        self.assertTrue(not x==3)
+        self.assertRaises(ReferenceError, lambda: x==3)
         self.assertRaises(ReferenceError, lambda: x==y)
 
-    # https://github.com/IronLanguages/ironpython3/issues/697
-    @unittest.expectedFailure
-    def test_equals(self):
+    def test_comparison(self):
         global called
         class C:
             for method, op in [('__eq__', '=='), ('__gt__', '>'), ('__lt__', '<'), ('__ge__', '>='), ('__le__', '<='), ('__ne__', '!=')]:
@@ -153,10 +151,15 @@ def %s(self, *args, **kwargs):
     return True
 """ % (method, op))
 
-        a = C()
-        x = _weakref.proxy(a)
-        for op in ('==', '>', '<', '>=', '<=', '!='):
-            self.assertEqual(eval('a ' + op + ' 3'), True);  self.assertEqual(called, op); called = None
-            self.assertEqual(eval('x ' + op + ' 3'), True);  self.assertEqual(called, op); called = None
+        class D(C):
+            def __call__(self):
+                pass
+
+        A = [ C(), D() ]
+        X = [ _weakref.proxy(a) for a in A ]
+        for (a, x) in zip(A, X):
+            for op in ('==', '>', '<', '>=', '<=', '!='):
+                self.assertEqual(eval('a ' + op + ' 3'), True);  self.assertEqual(called, op); called = None
+                self.assertEqual(eval('x ' + op + ' 3'), True);  self.assertEqual(called, op); called = None
 
 run_test(__name__)