Merge pull request #10638 from jklymak/enh-autodecode-pandastimestamp

tacaswell · web-flow · commit ea02861cfc84 · 2018-03-03T16:19:17.000-05:00
ENH: check `.values` in more places
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -437,6 +437,10 @@ def date2num(d):
     For details see the module docstring.
     """
 
+    if hasattr(d, "values"):
+        # this unpacks pandas series or dataframes...
+        d = d.values
+
     if ((isinstance(d, np.ndarray) and np.issubdtype(d.dtype, np.datetime64))
             or isinstance(d, np.datetime64)):
         return _dt64_to_ordinalf(d)
diff --git a/lib/matplotlib/units.py b/lib/matplotlib/units.py
@@ -160,6 +160,10 @@ def get_converter(self, x):
         if classx is not None:
             converter = self.get(classx)
 
+        if converter is None and hasattr(x, "values"):
+            # this unpacks pandas series or dataframes...
+            x = x.values
+
         # If x is an array, look inside the array for data with units
         if isinstance(x, np.ndarray) and x.size:
             xravel = x.ravel()
