Merge branch 'fix-comparison-to-None'

capnpy/struct_.py

@@ -241,12 +241,8 @@ def __hash__(self):
         return hash(self._key())
 
     def _equals(self, other):
-        mykey = self._key()
-        if isinstance(other, tuple):
-            otherkey = other
-        else:
-            otherkey = other._key()
-        return mykey == otherkey
+        # by doing this, we ensure that we compare equals to tuples
+        return other == self._key()
 
     # this is already defined in blob.py: however, it seems if we do not
     # redeclare it here, Cython won't use it

capnpy/testing/compiler/test_key.py

@@ -23,7 +23,14 @@ def test_key_on_struct(self):
         #
         assert p1 == (1, 2)
         assert p3 == (3, 4)
+        assert (1, 2) == p1
+        assert (3, 4) == p3
         assert hash(p1) == hash(p2) == hash((1, 2))
+        #
+        assert not p1 == None
+        assert p1 != None
+        assert not None == p1
+        assert None != p1
 
     def test_key_convert_case(self):
         schema = """