Merge pull request #39 from bbc/philipn-var-name-typos

correct inclusivity names in timerange_between

Author: Philip de Nier

CHANGELOG.md

@@ -1,5 +1,8 @@
 # mediatimestamp Changelog
 
+## 1.7.1
+- Correct inclusivity names in `timerange_between` method.
+
 ## 1.7.0
 - Added extend_to_encompass_timerange function for immutable.TimeRange.
 - Hardcode use of python3.4 in RPM spec file to workaround missing python3 soft

mediatimestamp/immutable.py

@@ -1179,16 +1179,16 @@ def timerange_between(self, other):
         elif self.is_earlier_than_timerange(other):
             inclusivity = TimeRange.EXCLUSIVE
             if not self.includes_end():
-                inclusivity |= TimeRange.INLCUDE_START
+                inclusivity |= TimeRange.INCLUDE_START
             if not other.includes_start():
                 inclusivity |= TimeRange.INCLUDE_END
             return TimeRange(self.end, other.start, inclusivity)
         else:
             inclusivity = TimeRange.EXCLUSIVE
             if not self.includes_start():
-                inclusivity |= TimeRange.INLCUDE_END
+                inclusivity |= TimeRange.INCLUDE_END
             if not other.includes_end():
-                inclusivity |= TimeRange.INCLUDE_start
+                inclusivity |= TimeRange.INCLUDE_START
             return TimeRange(other.end, self.start, inclusivity)
 
     def is_empty(self):

setup.py

@@ -18,7 +18,7 @@
 
 # Basic metadata
 name = 'mediatimestamp'
-version = '1.7.0.post0'
+version = '1.7.1'
 description = 'A timestamp library for high precision nanosecond timestamps'
 url = 'https://github.com/bbc/rd-apmm-python-lib-mediatimestamp'
 author = 'James P. Weaver'

tests/test_immutable.py

@@ -1466,6 +1466,25 @@ def test_split(self):
                 with self.assertRaises(ValueError):
                     tr.split_at(ts)
 
+    def test_timerange_between(self):
+        test_data = [
+            (TimeRange.from_str("[0:0_10:0)"), TimeRange.from_str("[5:0_15:0)"),
+                TimeRange.never()),
+            (TimeRange.from_str("[0:0_10:0)"), TimeRange.from_str("[15:0_20:0)"),
+                TimeRange.from_str("[10:0_15:0)")),
+            (TimeRange.from_str("[0:0_10:0]"), TimeRange.from_str("(15:0_20:0)"),
+                TimeRange.from_str("(10:0_15:0]")),
+            (TimeRange.from_str("[0:0_10:0)"), TimeRange.from_str("[15:0_20:0)"),
+                TimeRange.from_str("[10:0_15:0)")),
+            (TimeRange.from_str("[0:0_10:0]"), TimeRange.from_str("(15:0_20:0)"),
+                TimeRange.from_str("(10:0_15:0]")),
+        ]
+
+        for (left, right, expected) in test_data:
+            with self.subTest(left=left, right=right, expected=expected):
+                self.assertEqual(left.timerange_between(right), expected)
+                self.assertEqual(right.timerange_between(left), expected)
+
     def test_normalise(self):
         tests_tr = [
             (TimeRange.from_str("[0:0_1:0)"), Fraction(25, 1), TimeRange.ROUND_NEAREST,