Add support to check equality of AnyVector

Signed-off-by: Jean-Christophe Morin <[email protected]>

Author: JeanChristopheMorinPerso

src/py-opentimelineio/opentimelineio/core/_core_utils.py

@@ -302,6 +302,41 @@ def insert(self, index, item):
             if conversion_func else item
         )
 
+    def __le__(self, other):  # Taken from collections.abc.Set
+        if not isinstance(other, collections.abc.Sequence):
+            return NotImplemented
+        if len(self) > len(other):
+            return False
+        for elem in self:
+            if elem not in other:
+                return False
+        return True
+
+    def __lt__(self, other):  # Taken from collections.abc.Set
+        if not isinstance(other, collections.abc.Sequence):
+            return NotImplemented
+        return len(self) < len(other) and self.__le__(other)
+
+    def __gt__(self, other):  # Taken from collections.abc.Set
+        if not isinstance(other, collections.abc.Sequence):
+            return NotImplemented
+        return len(self) > len(other) and self.__ge__(other)
+
+    def __ge__(self, other):  # Taken from collections.abc.Set
+        if not isinstance(other, collections.abc.Sequence):
+            return NotImplemented
+        if len(self) < len(other):
+            return False
+        for elem in other:
+            if elem not in self:
+                return False
+        return True
+
+    def __eq__(self, other):  # Taken from collections.abc.Set
+        if not isinstance(other, collections.abc.Sequence):
+            return NotImplemented
+        return len(self) == len(other) and self.__le__(other)
+
     collections.abc.MutableSequence.register(sequenceClass)
     sequenceClass.__radd__ = __radd__
     sequenceClass.__add__ = __add__
@@ -311,6 +346,11 @@ def insert(self, index, item):
     sequenceClass.insert = insert
     sequenceClass.__str__ = __str__
     sequenceClass.__repr__ = __repr__
+    sequenceClass.__le__ = __le__
+    sequenceClass.__lt__ = __lt__
+    sequenceClass.__gt__ = __gt__
+    sequenceClass.__ge__ = __ge__
+    sequenceClass.__eq__ = __eq__
 
     seen = set()
     for klass in (collections.abc.MutableSequence, collections.abc.Sequence):

tests/test_serializable_object.py

@@ -70,13 +70,14 @@ def test_cons2(self):
         self.assertEqual(so.metadata['string'], 'myvalue')
         self.assertEqual(so.metadata['int'], -999999999999)
         self.assertIsInstance(so.metadata['list'], opentimelineio._otio.AnyVector)
-        self.assertEqual(list(so.metadata['list']), [1, 2.5, 'asd'])  # AnyVector. Is this right?
+        self.assertEqual(so.metadata['list'], opentimelineio._otio.AnyVector([1, 2.5, 'asd']))
         self.assertIsInstance(so.metadata['dict'], opentimelineio._otio.AnyDictionary)
-        # self.assertEqual(so.metadata['dict'], opentimelineio._otio.AnyDictionary({'map1': [345]}))
+        self.assertIsInstance(so.metadata['dict']['map1'], opentimelineio._otio.AnyVector)
+        self.assertEqual(so.metadata['dict'], opentimelineio._otio.AnyDictionary({'map1': [345]}))
         self.assertIsInstance(so.metadata['AnyVector'], opentimelineio._otio.AnyVector)
-        # self.assertEqual(list(so.metadata['AnyVector']), opentimelineio._otio.AnyVector([1, 'inside any vector']))
+        self.assertEqual(list(so.metadata['AnyVector']), opentimelineio._otio.AnyVector([1, 'inside any vector']))
         self.assertIsInstance(so.metadata['AnyDictionary'], opentimelineio._otio.AnyDictionary)
-        self.assertEqual(dict(so.metadata['AnyDictionary']), {'key_1': 1234, 'key_2': {'asdasdasd': 5.6}})
+        self.assertEqual(so.metadata['AnyDictionary'], opentimelineio._otio.AnyDictionary({'key_1': 1234, 'key_2': {'asdasdasd': 5.6}}))
         self.assertEqual(so.metadata['RationalTime'], opentimelineio.opentime.RationalTime(value=10.0, rate=5.0))
         self.assertEqual(so.metadata['TimeRange'], opentimelineio.opentime.TimeRange(
             opentimelineio.opentime.RationalTime(value=1.0),