FIX: unit-convert pcolorargs before interpolating

jklymak · jklymak · commit d471a218ff52 · 2020-09-23T06:47:47.000-07:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -5455,8 +5455,7 @@ def imshow(self, X, cmap=None, norm=None, aspect=None,
         self.add_image(im)
         return im
 
-    @staticmethod
-    def _pcolorargs(funcname, *args, shading='flat'):
+    def _pcolorargs(self, funcname, *args, shading='flat', **kwargs):
         # - create X and Y if not present;
         # - reshape X and Y as needed if they are 1-D;
         # - check for proper sizes based on `shading` kwarg;
@@ -5487,6 +5486,11 @@ def _pcolorargs(funcname, *args, shading='flat'):
             # Check x and y for bad data...
             C = np.asanyarray(args[2])
             X, Y = [cbook.safe_masked_invalid(a) for a in args[:2]]
+            # 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)
+
             if funcname == 'pcolormesh':
                 if np.ma.is_masked(X) or np.ma.is_masked(Y):
                     raise ValueError(
@@ -5735,14 +5739,10 @@ def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,
         if shading is None:
             shading = rcParams['pcolor.shading']
         shading = shading.lower()
-        X, Y, C, shading = self._pcolorargs('pcolor', *args, shading=shading)
+        X, Y, C, shading = self._pcolorargs('pcolor', *args, shading=shading,
+                                            **kwargs)
         Ny, Nx = X.shape
 
-        # 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 MA, if necessary.
         C = ma.asarray(C)
         X = ma.asarray(X)
@@ -6011,14 +6011,10 @@ def pcolormesh(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
         kwargs.setdefault('edgecolors', 'None')
 
         X, Y, C, shading = self._pcolorargs('pcolormesh', *args,
-                                            shading=shading)
+                                            shading=shading, **kwargs)
         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()
