diff --git a/src/wrf/constants.py b/src/wrf/constants.py index 47821ef..1128855 100755 --- a/src/wrf/constants.py +++ b/src/wrf/constants.py @@ -16,7 +16,7 @@ class Constants(object): for key, val in viewitems(wrf_constants.__dict__): - setattr(Constants, key.upper(), np.asscalar(val)) + setattr(Constants, key.upper(), val.item()) OMP_SCHED_STATIC = omp_constants.fomp_sched_static OMP_SCHED_DYNAMIC = omp_constants.fomp_sched_dynamic diff --git a/src/wrf/decorators.py b/src/wrf/decorators.py index 806fbf5..2ff4dec 100644 --- a/src/wrf/decorators.py +++ b/src/wrf/decorators.py @@ -1,6 +1,7 @@ from __future__ import (absolute_import, division, print_function) -from collections import Iterable, OrderedDict +from collections import OrderedDict +from collections.abc import Iterable import wrapt import numpy as np diff --git a/src/wrf/latlonutils.py b/src/wrf/latlonutils.py index 22191af..0a66030 100644 --- a/src/wrf/latlonutils.py +++ b/src/wrf/latlonutils.py @@ -1,6 +1,6 @@ from __future__ import (absolute_import, division, print_function) -from collections import Iterable +from collections.abc import Iterable import numpy as np diff --git a/src/wrf/util.py b/src/wrf/util.py index d8f6567..40229c7 100644 --- a/src/wrf/util.py +++ b/src/wrf/util.py @@ -3,7 +3,8 @@ from __future__ import (absolute_import, division, print_function) import os from sys import version_info from copy import copy -from collections import Iterable, Mapping, OrderedDict +from collections import OrderedDict +from collections.abc import Iterable, Mapping from itertools import product, tee from types import GeneratorType import datetime as dt