From 9fe6121dc4b3a18c7b12c62bece546d2d20148a6 Mon Sep 17 00:00:00 2001 From: Mathias Hauser Date: Sun, 28 Mar 2021 21:45:13 +0200 Subject: [PATCH] use object instead of np.object --- nc_time_axis/__init__.py | 2 +- nc_time_axis/tests/unit/test_NetCDFTimeConverter.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nc_time_axis/__init__.py b/nc_time_axis/__init__.py index b3e0804..e22469b 100644 --- a/nc_time_axis/__init__.py +++ b/nc_time_axis/__init__.py @@ -271,7 +271,7 @@ def convert(cls, value, unit, axis): shape = None if isinstance(value, np.ndarray): # Don't do anything with numeric types. - if value.dtype != np.object: + if value.dtype != object: return value shape = value.shape value = value.reshape(-1) diff --git a/nc_time_axis/tests/unit/test_NetCDFTimeConverter.py b/nc_time_axis/tests/unit/test_NetCDFTimeConverter.py index 5d5edaf..2fa0c42 100644 --- a/nc_time_axis/tests/unit/test_NetCDFTimeConverter.py +++ b/nc_time_axis/tests/unit/test_NetCDFTimeConverter.py @@ -119,12 +119,12 @@ def test_cftime_raw_date(self): def test_cftime_np_array_CalendarDateTime(self): val = np.array([CalendarDateTime(cftime.datetime(2012, 6, 4), - '360_day')], dtype=np.object) + '360_day')], dtype=object) result = NetCDFTimeConverter().convert(val, None, None) self.assertEqual(result, np.array([4473.])) def test_cftime_np_array_raw_date(self): - val = np.array([cftime.Datetime360Day(2012, 6, 4)], dtype=np.object) + val = np.array([cftime.Datetime360Day(2012, 6, 4)], dtype=object) result = NetCDFTimeConverter().convert(val, None, None) self.assertEqual(result, np.array([4473.]))