Address moved import of Iterable (#4252)

* Address moved import of Iterable

* Fixed flakes

holoviews/core/data/grid.py

@@ -2,7 +2,8 @@
 
 import sys
 import datetime as dt
-from collections import OrderedDict, defaultdict, Iterable
+
+from collections import OrderedDict, defaultdict
 
 try:
     import itertools.izip as zip
@@ -374,7 +375,7 @@ def invert_index(cls, index, length):
             if stop is not None:
                 new_start = length - stop
             return slice(new_start-1, new_stop-1)
-        elif isinstance(index, Iterable):
+        elif isinstance(index, util.Iterable):
             new_index = []
             for ind in index:
                 new_index.append(length-ind)

holoviews/core/util.py

@@ -28,6 +28,11 @@
 if sys.version_info.major >= 3:
     import builtins as builtins   # noqa (compatibility)
 
+    if sys.version_info.minor > 3:
+        from collections.abc import Iterable # noqa (compatibility)
+    else:
+        from collections import Iterable # noqa (compatibility)
+
     basestring = str
     unicode = str
     long = int
@@ -39,6 +44,7 @@
     LooseVersion = _LooseVersion
 else:
     import __builtin__ as builtins # noqa (compatibility)
+    from collections import Iterable # noqa (compatibility)
 
     basestring = basestring
     unicode = unicode

holoviews/operation/datashader.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division
 
-from collections import Callable, Iterable
+from collections import Callable
 import warnings
 
 import param
@@ -24,7 +24,7 @@
                     CompositeOverlay, Dataset, Overlay, OrderedDict)
 from ..core.data import PandasInterface, XArrayInterface, DaskInterface
 from ..core.util import (
-    LooseVersion, basestring, cftime_types, cftime_to_timestamp,
+    Iterable, LooseVersion, basestring, cftime_types, cftime_to_timestamp,
     datetime_types, dt_to_int, isfinite, get_param_values, max_range)
 from ..element import (Image, Path, Curve, RGB, Graph, TriMesh,
                        QuadMesh, Contours, Spikes, Area, Spread,