Unwrap other if it is a proxy, so the proxy can compare equal to itself.

zopefoundation · Sep 5, 2018 · 4d089ff · 4d089ff
1 parent 024cb9a
commit 4d089ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/zope/security/_proxy.c b/src/zope/security/_proxy.c
@@ -361,6 +361,10 @@ proxy_richcompare(SecurityProxy* self, PyObject* other, int op)
 {
   PyObject *result = NULL;
 
+  if (Proxy_Check(other)) {
+      other = ((SecurityProxy*)(other))->proxy.proxy_object;
+  }
+
   result = PyObject_RichCompare(self->proxy.proxy_object, other, op);
   if (result == Py_True || result == Py_False)
     return result;

diff --git a/src/zope/security/tests/test_proxy.py b/src/zope/security/tests/test_proxy.py
@@ -1864,7 +1864,8 @@ def testRichCompareProxyWithObjectOK(self):
         self.assertTrue(self.p == self.x)
 
     def testRichCompareObjectWithProxyOK(self):
-        self.assertTrue(self.x == self.p)
+        # Proxy does not get unwrapped as `Something` class defines `__eq__`.
+        self.assertFalse(self.x == self.p)
 
     def testRichCompareWithProxyWithProxyOK(self):
         self.assertTrue(self.p == self.p)