Merge pull request #21149 from meeseeksmachine/auto-backport-of-pr-21146-on-v3.5.x

jklymak · web-flow · commit 4ff96adf6549 · 2021-09-22T15:21:20.000+02:00
Backport PR #21146 on branch v3.5.x (Fix clim handling for pcolor{,mesh}.)
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -5841,12 +5841,8 @@ def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,
 
         kwargs.setdefault('snap', False)
 
-        collection = mcoll.PolyCollection(verts, **kwargs)
-
-        collection.set_alpha(alpha)
-        collection.set_array(C)
-        collection.set_cmap(cmap)
-        collection.set_norm(norm)
+        collection = mcoll.PolyCollection(
+            verts, array=C, cmap=cmap, norm=norm, alpha=alpha, **kwargs)
         collection._scale_norm(norm, vmin, vmax)
         self._pcolor_grid_deprecation_helper()
 
@@ -6075,14 +6071,10 @@ def pcolormesh(self, *args, alpha=None, norm=None, cmap=None, vmin=None,
         # convert to one dimensional array
         C = C.ravel()
 
-        collection = mcoll.QuadMesh(
-            coords, antialiased=antialiased, shading=shading, **kwargs)
         snap = kwargs.get('snap', rcParams['pcolormesh.snap'])
-        collection.set_snap(snap)
-        collection.set_alpha(alpha)
-        collection.set_array(C)
-        collection.set_cmap(cmap)
-        collection.set_norm(norm)
+        collection = mcoll.QuadMesh(
+            coords, antialiased=antialiased, shading=shading, snap=snap,
+            array=C, cmap=cmap, norm=norm, alpha=alpha, **kwargs)
         collection._scale_norm(norm, vmin, vmax)
         self._pcolor_grid_deprecation_helper()
 
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -7225,3 +7225,11 @@ def test_empty_line_plots():
     _, ax = plt.subplots()
     line = ax.plot([], [])
     assert len(line) == 1
+
+
+def test_clim():
+    ax = plt.figure().add_subplot()
+    for plot_method in [ax.imshow, ax.pcolor, ax.pcolormesh, ax.pcolorfast]:
+        clim = (7, 8)
+        norm = plot_method([[0, 1], [2, 3]], clim=clim).norm
+        assert (norm.vmin, norm.vmax) == clim
