Support timerange arg in TimeRange.__contains__

sem-ver: feature

Author: Philip de Nier

mediatimestamp/immutable/timerange.py

@@ -371,9 +371,13 @@ def finite(self) -> bool:
         return (self.start is not None and self.end is not None)
 
     def __contains__(self, ts: object) -> bool:
-        """Returns true if the timestamp is within this range."""
-        return (isinstance(ts, (Timestamp, SupportsMediaTimestamp, int, float)) and
-                self.contains_subrange(mediatimestamp(ts)))
+        """Returns true if the timestamp or timerange is wholly within this range."""
+        return ((
+                    isinstance(ts, (Timestamp, SupportsMediaTimestamp, int, float)) and
+                    self.contains_subrange(mediatimestamp(ts))
+                ) or (
+                    isinstance(ts, (TimeRange, SupportsMediaTimeRange)) and
+                    self.contains_subrange(ts)))
 
     def __eq__(self, other: object) -> bool:
         if not isinstance(other, SupportsMediaTimeRange):

tests/test_timerange.py

@@ -369,9 +369,17 @@ 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)"))
+
+        self.assertNotIn(Timestamp.from_str("0:0"), TimeRange.from_str("[1:0_10:0)"))
+        self.assertIn(Timestamp.from_str("1:0"), TimeRange.from_str("[1:0_10:0)"))
+
+        self.assertNotIn(TimeRange.from_str("[0:0_10:0)"), TimeRange.from_str("[0:0_5:0)"))
+        self.assertIn(TimeRange.from_str("0:0_5:0"), TimeRange.from_str("[0:0_10:0)"))
+
         # The subrange tests will cover the rest
 
     def _check_intersection(self, a, b, c, d):