Fix datetime mess

jklymak · jklymak · commit db394cbf9905 · 2018-07-16T05:46:24.000-07:00
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -411,19 +411,24 @@ 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)
     if not cbook.iterable(d):
+        if hasattr(d, 'dtype'):
+            if (np.issubdtype(d.dtype, np.datetime64) or
+                        isinstance(d, np.datetime64)):
+                return _dt64_to_ordinalf(d)
         return _to_ordinalf(d)
     else:
         d = np.asarray(d)
+        # note that this unpacks anything that has a numpy array in it
+        # and just returns the array.  So this strips the array out of
+        # a pandas series object, for instance.
         if not d.size:
             return d
+        if hasattr(d, 'dtype'):
+            if ((isinstance(d, np.ndarray) and
+                    np.issubdtype(d.dtype, np.datetime64)) or
+                    isinstance(d, np.datetime64)):
+                return _dt64_to_ordinalf(d)
         return _to_ordinalf_np_vectorized(d)
 
 
diff --git a/lib/matplotlib/testing/conftest.py b/lib/matplotlib/testing/conftest.py
@@ -82,17 +82,8 @@ def pd():
     pd = pytest.importorskip('pandas')
     try:
         from pandas.plotting import (
-            register_matplotlib_converters as register)
+            deregister_matplotlib_converters as deregister)
+        deregister()
     except ImportError:
-        from pandas.tseries.converter import register
-    register()
-    try:
-        yield pd
-    finally:
-        try:
-            from pandas.plotting import (
-                deregister_matplotlib_converters as deregister)
-        except ImportError:
-            pass
-        else:
-            deregister()
+        pass
+    return pd
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -5257,6 +5257,18 @@ def test_pandas_bar_align_center(pd):
     fig.canvas.draw()
 
 
+def test_pandas_data_unpack(pd):
+    # smoke test for all these different calling methods.
+    dates = [datetime.datetime(2018, 7, i) for i in range(1, 5)]
+    values = np.cumsum(np.random.rand(len(dates)))
+    df = pd.DataFrame({"dates": dates, "values": values})
+    plt.plot(df["dates"].values,  df["values"])
+    plt.scatter(df["dates"],  df["values"])
+    plt.plot("dates", "values", data=df)
+    plt.scatter(x="dates", y="values", data=df)
+    plt.draw()
+
+
 def test_axis_set_tick_params_labelsize_labelcolor():
     # Tests fix for issue 4346
     axis_1 = plt.subplot()
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -585,7 +585,7 @@ def tz_convert(*args):
 
 def test_dateboxplot_pandas(pd):
     # smoke test that this doesn't fail.
-    data = np.random.rand(5,2)
+    data = np.random.rand(5, 2)
     years = pd.date_range('1/1/2000',
                           periods=2, freq=pd.DateOffset(years=1)).year
     # Does not work
