diff --git a/firanka/ranges.py b/firanka/ranges.py index 908d646dd265ee7b726e87f930ec8742c3c4880a..e9ce0012d251606ae5845a23f78df72520935884 100644 --- a/firanka/ranges.py +++ b/firanka/ranges.py @@ -37,7 +37,7 @@ class Range(object): def __fromslice(self, rs): start = float('-inf') if rs.start is None else rs.start - stop = float('+inf') if rs.stop is not None else rs.stop + stop = float('+inf') if rs.stop is None else rs.stop return start, stop, not math.isinf(start), not math.isinf(stop) def __fromrange(self, rs): @@ -97,8 +97,7 @@ class Range(object): if isinstance(x, Range): if ((x.start == self.start) and (x.left_inc ^ self.left_inc)) \ - or ((x.stop == self.stop) and ( - x.right_inc ^ self.right_inc)): + or ((x.stop == self.stop) and (x.right_inc ^ self.right_inc)): return False return (x.start >= self.start) and (x.stop <= self.stop) diff --git a/tests/test_range.py b/tests/test_range.py index c8bc9353b508d85f803932cbaf644565ff33a667..3f19e904bf021e115dcd57447d27a24c4026554f 100644 --- a/tests/test_range.py +++ b/tests/test_range.py @@ -60,3 +60,4 @@ class TestRange(unittest.TestCase): self.assertTrue(Range('<-5;5>') in Range('<-10;10>')) self.assertTrue('(-1;6)' in Range(-10.0, 10.0, True, False)) + self.assertTrue('<0.5;1.5>' in Range('<0;2>'))