Matplotlib plotting fixes (#2197)

holoviz · Dec 18, 2017 · ea90ebd · ea90ebd
1 parent 7c06dbd
commit ea90ebd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/holoviews/plotting/mpl/__init__.py b/holoviews/plotting/mpl/__init__.py
@@ -7,6 +7,7 @@
 from ...core import Layout, Collator, GridMatrix, config
 from ...core.options import Cycle, Palette, Options
 from ...core.overlay import NdOverlay, Overlay
+from ...core.util import pd
 from ...element import * # noqa (API import)
 from ..plot import PlotSelector
 from .annotation import * # noqa (API import)
@@ -24,6 +25,10 @@
 
 mpl_ge_150 = LooseVersion(mpl.__version__) >= '1.5.0'
 
+if pd:
+    from pandas.tseries import converter
+    converter.register()
+
 
 def set_style(key):
     """

diff --git a/holoviews/plotting/mpl/element.py b/holoviews/plotting/mpl/element.py
@@ -823,7 +823,7 @@ def _adjust_legend(self, overlay, axis):
         else:
             leg_spec = self.legend_specs[self.legend_position]
             if self.legend_cols: leg_spec['ncol'] = self.legend_cols
-            leg = axis.legend(data.keys(), data.values(),
+            leg = axis.legend(list(data.keys()), list(data.values()),
                               title=title, scatterpoints=1,
                               **dict(leg_spec, **self._fontsize('legend')))
             title_fontsize = self._fontsize('legend_title')