Merge pull request #9213 from matplotlib/auto-backport-of-pr-9168

tacaswell · web-flow · commit cb9ddbc33258 · 2017-09-21T23:31:34.000-04:00
Backport PR #9168 on branch v2.1.x
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -5620,15 +5620,16 @@ def pcolormesh(self, *args, **kwargs):
 
         X, Y, C = self._pcolorargs('pcolormesh', *args, allmatch=allmatch)
         Ny, Nx = X.shape
-
+        X = X.ravel()
+        Y = Y.ravel()
         # unit conversion allows e.g. datetime objects as axis values
         self._process_unit_info(xdata=X, ydata=Y, kwargs=kwargs)
         X = self.convert_xunits(X)
         Y = self.convert_yunits(Y)
 
         # convert to one dimensional arrays
         C = C.ravel()
-        coords = np.column_stack((X.flat, Y.flat)).astype(float, copy=False)
+        coords = np.column_stack((X, Y)).astype(float, copy=False)
 
         collection = mcoll.QuadMesh(Nx - 1, Ny - 1, coords,
                                     antialiased=antialiased, shading=shading,
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -4929,6 +4929,17 @@ def test_broken_barh_empty():
     ax.broken_barh([], (.1, .5))
 
 
+def test_pandas_pcolormesh():
+    pd = pytest.importorskip('pandas')
+
+    time = pd.date_range('2000-01-01', periods=10)
+    depth = np.arange(20)
+    data = np.random.rand(20, 10)
+
+    fig, ax = plt.subplots()
+    ax.pcolormesh(time, depth, data)
+
+
 def test_pandas_indexing_dates():
     pd = pytest.importorskip('pandas')
 
