diff --git a/csp/curve.py b/csp/curve.py index 9237144fe..9322cb713 100644 --- a/csp/curve.py +++ b/csp/curve.py @@ -1,4 +1,3 @@ -import copy from datetime import timedelta from typing import Union @@ -22,12 +21,9 @@ def __init__(self, typ, data): def start(self, start_time, end_time): if isinstance(self._data[0][0], timedelta): - self._data = copy.copy(self._data) - for idx, data in enumerate(self._data): - self._data[idx] = (start_time + data[0], data[1]) + self._data = [(start_time + offset, value) for offset, value in self._data] elif self._data[0][0].tzinfo is not None: - for idx, data in enumerate(self._data): - self._data[idx] = (data[0].astimezone(pytz.UTC).replace(tzinfo=None), data[1]) + self._data = [(time.astimezone(pytz.UTC).replace(tzinfo=None), value) for time, value in self._data] while self._index < len(self._data) and self._data[self._index][0] < start_time: self._index += 1 diff --git a/csp/tests/test_curve.py b/csp/tests/test_curve.py index 3ce860240..d516997c4 100644 --- a/csp/tests/test_curve.py +++ b/csp/tests/test_curve.py @@ -1,5 +1,5 @@ import unittest -from datetime import datetime, timedelta +from datetime import datetime, timedelta, timezone import numpy @@ -25,6 +25,18 @@ def g(): self.assertEqual([v[0] for v in res], [datetime(2020, 1, 1) + timedelta(i) for i in range(10)]) self.assertEqual([v[1] for v in res], list(range(10))) + def test_timezone_aware_curve_does_not_mutate_input(self): + local_time = datetime(2020, 1, 1, 3, tzinfo=timezone(timedelta(hours=3))) + data = [(local_time, 42)] + + def g(): + return csp.curve(typ=int, data=data) + + for _ in range(2): + result = csp.run(g, starttime=datetime(2020, 1, 1), endtime=timedelta(seconds=1))[0] + self.assertEqual(result, [(datetime(2020, 1, 1), 42)]) + self.assertEqual(data, [(local_time, 42)]) + def test_numpy(self): def g(): times = numpy.array([csp.engine_start_time() + timedelta(i) for i in range(10)]).astype(numpy.datetime64)