Fix TimeRange.__contains__ when checking in eternity

Call `contains_subrange` to ensure correctness and consistency

sem-ver: bugfix

Author: Philip de Nier

mediatimestamp/immutable/timerange.py

@@ -372,15 +372,8 @@ def finite(self) -> bool:
 
     def __contains__(self, ts: object) -> bool:
         """Returns true if the timestamp is within this range."""
-        return ((isinstance(ts, SupportsMediaTimestamp)) and
-                (self.start is None or mediatimestamp(ts) >= self.start) and
-                (self.end is None or mediatimestamp(ts) <= self.end) and
-                (not ((self.start is not None) and
-                      (mediatimestamp(ts) == self.start) and
-                      (self.inclusivity & TimeRange.INCLUDE_START == 0))) and
-                (not ((self.end is not None) and
-                      (mediatimestamp(ts) == self.end) and
-                      (self.inclusivity & TimeRange.INCLUDE_END == 0))))
+        return (isinstance(ts, (Timestamp, SupportsMediaTimestamp, int, float)) and
+                self.contains_subrange(mediatimestamp(ts)))
 
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, SupportsMediaTimeRange):

tests/test_timerange.py

@@ -353,6 +353,27 @@ def test_subrange__negative(self):
 
         self._check_subrange(a, b, c, d)
 
+    def test_subrange__eternity_never(self):
+        self.assertTrue(TimeRange.eternity().contains_subrange(TimeRange.eternity()))
+        self.assertTrue(TimeRange.eternity().contains_subrange(TimeRange.from_str("[0:0]")))
+        self.assertTrue(TimeRange.eternity().contains_subrange(TimeRange.from_str("[0:0_1:0)")))
+
+        self.assertTrue(TimeRange.eternity().contains_subrange(TimeRange.never()))
+
+        self.assertFalse(TimeRange.never().contains_subrange(TimeRange.eternity()))
+        self.assertFalse(TimeRange.never().contains_subrange(TimeRange.never()))
+        self.assertFalse(TimeRange.never().contains_subrange(TimeRange.from_str("[0:0]")))
+        self.assertFalse(TimeRange.never().contains_subrange(TimeRange.from_str("[0:0_1:0)")))
+
+    def test_contains(self):
+        self.assertNotIn(None, TimeRange.from_str("[0:0]"))
+        self.assertNotIn(None, TimeRange.never())
+        self.assertNotIn(None, TimeRange.eternity())
+        self.assertNotIn(1.0, TimeRange.from_str("[0:0]"))
+        self.assertIn(1.0, TimeRange.from_str("[1:0]"))
+        self.assertIn(1.0, TimeRange.from_str("[0:0_10:0)"))
+        # The subrange tests will cover the rest
+
     def _check_intersection(self, a, b, c, d):
         self.assertEqual(TimeRange(a, c, TimeRange.INCLUDE_START).intersect_with(b), mediatimerange(b))