Skip to content

Commit 97bd7f7

Browse files
committed
make sure option is passed down num2date
1 parent bf6a0de commit 97bd7f7

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

cf_units/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2033,4 +2033,6 @@ def num2date(self, time_value, only_use_cftime_datetimes=False):
20332033
cdf_utime = self.utime(
20342034
only_use_cftime_datetimes=only_use_cftime_datetimes)
20352035

2036-
return _num2date_to_nearest_second(time_value, cdf_utime)
2036+
return _num2date_to_nearest_second(
2037+
time_value, cdf_utime,
2038+
only_use_cftime_datetimes=only_use_cftime_datetimes)

cf_units/tests/test_unit.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from operator import truediv
3030

3131
import numpy as np
32+
import cftime
3233

3334
import cf_units as unit
3435
from cf_units import suppress_errors
@@ -262,7 +263,7 @@ def test_add_float_offset(self):
262263
def test_not_numerical_offset(self):
263264
u = Unit('meter')
264265
with self.assertRaisesRegex(TypeError,
265-
'unsupported operand type'):
266+
'unsupported operand type'):
266267
operator.add(u, 'not_a_number')
267268

268269
def test_unit_unknown(self):
@@ -990,6 +991,13 @@ def test_num2date(self):
990991
self.assertEqual(str(res), '2010-11-02 13:00:00')
991992
self.assertIsInstance(res, datetime.datetime)
992993

994+
def test_num2date_cftime_type(self):
995+
u = Unit('hours since 2010-11-02 12:00:00',
996+
calendar=unit.CALENDAR_STANDARD)
997+
res = u.num2date(1, only_use_cftime_datetimes=True)
998+
self.assertEqual(str(res), '2010-11-02 13:00:00')
999+
self.assertIsInstance(res, cftime.DatetimeGregorian)
1000+
9931001
def test_date2num(self):
9941002
u = Unit('hours since 2010-11-02 12:00:00',
9951003
calendar=unit.CALENDAR_STANDARD)

0 commit comments

Comments
 (0)