diff --git a/xarray/backends/common.py b/xarray/backends/common.py index 405d989f4af..9a3e7654ce2 100644 --- a/xarray/backends/common.py +++ b/xarray/backends/common.py @@ -4,7 +4,8 @@ import time import traceback import warnings -from collections import Mapping, OrderedDict +from collections.abc import Mapping +from collections import OrderedDict import numpy as np diff --git a/xarray/core/dataset.py b/xarray/core/dataset.py index 4f9c61b3269..6ab5b1459ee 100644 --- a/xarray/core/dataset.py +++ b/xarray/core/dataset.py @@ -3,7 +3,8 @@ import functools import sys import warnings -from collections import Mapping, defaultdict +from collections import defaultdict +from collections.abc import Mapping from distutils.version import LooseVersion from numbers import Number @@ -1380,7 +1381,7 @@ def _validate_indexers(self, indexers): """ Here we make sure + indexer has a valid keys + indexer is in a valid data type - + string indexers are cast to the appropriate date type if the + + string indexers are cast to the appropriate date type if the associated index is a DatetimeIndex or CFTimeIndex """ from .dataarray import DataArray @@ -1963,7 +1964,7 @@ def _validate_interp_indexer(x, new_x): 'Instead got\n{}'.format(new_x)) else: return (x, new_x) - + variables = OrderedDict() for name, var in iteritems(obj._variables): if name not in indexers: diff --git a/xarray/core/indexing.py b/xarray/core/indexing.py index d51da471c8d..0aca0334e0e 100644 --- a/xarray/core/indexing.py +++ b/xarray/core/indexing.py @@ -2,7 +2,8 @@ import functools import operator -from collections import Hashable, defaultdict +from collections.abc import Hashable +from collections import defaultdict from datetime import timedelta import numpy as np diff --git a/xarray/core/missing.py b/xarray/core/missing.py index 3f4e0fc3ac9..8986637dbdb 100644 --- a/xarray/core/missing.py +++ b/xarray/core/missing.py @@ -1,7 +1,7 @@ from __future__ import absolute_import, division, print_function import warnings -from collections import Iterable +from collections.abc import Iterable from functools import partial import numpy as np diff --git a/xarray/core/utils.py b/xarray/core/utils.py index 50d6ec7e05a..1b8b5b3c209 100644 --- a/xarray/core/utils.py +++ b/xarray/core/utils.py @@ -8,7 +8,7 @@ import os.path import re import warnings -from collections import Iterable, Mapping, MutableMapping, MutableSet +from collections.abc import Iterable, Mapping, MutableMapping, MutableSet import numpy as np import pandas as pd