Warning fixes (#4022)

holoviz · Oct 3, 2019 · 0c46c62 · 0c46c62
1 parent 35a7f59
commit 0c46c62
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/holoviews/core/data/array.py b/holoviews/core/data/array.py
@@ -40,7 +40,7 @@ def init(cls, eltype, data, kdims, vdims):
             dict_data = sorted(data.items())
             dataset = zip(*((util.wrap_tuple(k)+util.wrap_tuple(v))
                             for k, v in dict_data))
-            data = np.column_stack(dataset)
+            data = np.column_stack(list(dataset))
         elif isinstance(data, tuple):
             data = [d if isinstance(d, np.ndarray) else np.asarray(d) for d in data]
             if len(set(d.dtype.kind for d in data)) > 1:

diff --git a/holoviews/ipython/display_hooks.py b/holoviews/ipython/display_hooks.py
@@ -72,7 +72,7 @@ def single_frame_plot(obj):
     """
     Returns plot, renderer and format for single frame export.
     """
-    obj = Layout.from_values(obj) if isinstance(obj, AdjointLayout) else obj
+    obj = Layout(obj) if isinstance(obj, AdjointLayout) else obj
 
     backend = Store.current_backend
     renderer = Store.renderers[backend]
@@ -208,7 +208,8 @@ def map_display(vmap, max_frames):
 
 @display_hook
 def layout_display(layout, max_frames):
-    if isinstance(layout, AdjointLayout): layout = Layout.from_values(layout)
+    if isinstance(layout, AdjointLayout):
+        layout = Layout(layout)
     if not isinstance(layout, (Layout, NdLayout)): return None
 
     nframes = len(unique_dimkeys(layout)[1])

diff --git a/holoviews/plotting/util.py b/holoviews/plotting/util.py
@@ -84,7 +84,7 @@ def collate(obj):
             expanded = []
             for el in obj.values():
                 if isinstance(el, HoloMap) and not displayable(el):
-                    collated_layout = Layout.from_values(el.collate())
+                    collated_layout = Layout(el.collate())
                     expanded.extend(collated_layout.values())
             return Layout(expanded)
         except:
@@ -261,7 +261,8 @@ def get_plot_frame(map_obj, key_map, cached=False):
     Returns:
         The item in the mapping corresponding to the supplied key.
     """
-    if map_obj.kdims and len(map_obj.kdims) == 1 and map_obj.kdims[0] == 'Frame':
+    if (map_obj.kdims and len(map_obj.kdims) == 1 and map_obj.kdims[0] == 'Frame' and
+        not isinstance(map_obj, DynamicMap)):
         # Special handling for static plots
         return map_obj.last
     key = tuple(key_map[kd.name] for kd in map_obj.kdims if kd.name in key_map)