Fixed array and dict interface validation

holoviz · Dec 19, 2017 · c0b09b2 · c0b09b2
1 parent fe91129
commit c0b09b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/holoviews/core/data/array.py b/holoviews/core/data/array.py
@@ -41,7 +41,7 @@ def init(cls, eltype, data, kdims, vdims):
                             for k, v in dict_data))
             data = np.column_stack(dataset)
         elif isinstance(data, tuple):
-            data = [d if isinstance(d, np.ndarray) else np.array(d) for d in data]
+            data = [np.asarray(d) for d in data]
             if any(arr.ndim > 1 for arr in data):
                 raise ValueError('ArrayInterface expects data to be of flat shape.')
             if cls.expanded(data):

diff --git a/holoviews/core/data/dictionary.py b/holoviews/core/data/dictionary.py
@@ -95,9 +95,10 @@ def init(cls, eltype, data, kdims, vdims):
                     for i, sd in enumerate(d):
                         unpacked.append((sd, vals[:, i]))
                 else:
-                    if not vals.ndim == 1:
+                    vals = vals if np.isscalar(vals) else np.asarray(vals)
+                    if not np.isscalar(vals) and not vals.ndim == 1:
                         raise ValueError('DictInterface expects data for each column to be flat.')
-                    unpacked.append((d, vals if np.isscalar(vals) else np.asarray(vals)))
+                    unpacked.append((d, vals))
             if not cls.expanded([d[1] for d in unpacked if not np.isscalar(d[1])]):
                 raise ValueError('DictInterface expects data to be of uniform shape.')
             if isinstance(data, odict_types):