From 971ecec9cfc0fd5aa72446755a2e7c8b0fc7ee66 Mon Sep 17 00:00:00 2001 From: Timo Furrer Date: Sun, 28 May 2017 12:18:35 +0200 Subject: [PATCH] Raise ValueError instead of AssertionError --- maya/core.py | 9 +++++++-- tests/test_maya_interval.py | 9 +++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/maya/core.py b/maya/core.py index 431781b..dc04c50 100644 --- a/maya/core.py +++ b/maya/core.py @@ -415,7 +415,9 @@ class MayaInterval(object): # Convert seconds to timedelta, if appropriate. duration = seconds_or_timedelta(duration) - assert duration > timedelta(seconds=0), 'cannot call split with a non-positive timedelta' + if duration <= timedelta(seconds=0): + raise ValueError('cannot call split with a non-positive timedelta') + start = self.start while start < self.end: if start + duration <= self.end: @@ -431,7 +433,10 @@ class MayaInterval(object): duration = seconds_or_timedelta(duration) timezone = pytz.timezone(timezone) - assert duration > timedelta(seconds=0), 'cannot quantize by non-positive timedelta' + + if duration <= timedelta(seconds=0): + raise ValueError('cannot quantize by non-positive timedelta') + epoch = timezone.localize(Datetime(1970, 1, 1)) seconds = int(duration.total_seconds()) diff --git a/tests/test_maya_interval.py b/tests/test_maya_interval.py index 99d2fe1..0bdc06c 100755 --- a/tests/test_maya_interval.py +++ b/tests/test_maya_interval.py @@ -387,10 +387,10 @@ def test_interval_split_non_positive_delta(): end = start.add(days=1) interval = maya.MayaInterval(start=start, end=end) - with pytest.raises(AssertionError): + with pytest.raises(ValueError): list(interval.split(timedelta(seconds=0))) - with pytest.raises(AssertionError): + with pytest.raises(ValueError): list(interval.split(timedelta(seconds=-10))) @@ -442,9 +442,10 @@ def test_quantize_invalid_delta(): end = start.add(days=1) interval = maya.MayaInterval(start=start, end=end) - with pytest.raises(AssertionError): + with pytest.raises(ValueError): interval.quantize(timedelta(minutes=0)) - with pytest.raises(AssertionError): + + with pytest.raises(ValueError): interval.quantize(timedelta(minutes=-1))