Merge pull request #556 from ioam/columns_generators

Fixed generator check on DataColumns
holoviz · Mar 14, 2016 · 84b258e · 84b258e
2 parents d4779cb + bcfdf14
commit 84b258e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/holoviews/core/data.py b/holoviews/core/data.py
@@ -424,8 +424,7 @@ def initialize(cls, eltype, data, kdims, vdims, datatype=None):
             data = data.data
         elif isinstance(data, Element):
             data = tuple(data.dimension_values(d) for d in kdims+vdims)
-        elif (not (util.is_dataframe(data) or isinstance(data, (tuple, dict, np.ndarray, list)))
-              and sys.version_info.major >= 3):
+        elif isinstance(data, util.generator_types):
             data = list(data)
 
         # Set interface priority order

diff --git a/holoviews/core/util.py b/holoviews/core/util.py
@@ -30,12 +30,16 @@
     bz = None
 
 # Python3 compatibility
+import types
 if sys.version_info.major == 3:
     basestring = str
     unicode = str
+    generator_types = (zip, range, types.GeneratorType)
 else:
     basestring = basestring
     unicode = unicode
+    from itertools import izip
+    generator_types = (izip, xrange, types.GeneratorType)
 
 
 def process_ellipses(obj, key, vdim_selection=False):