matplotlib
diff --git a/‎lib/matplotlib/colorbar.py‎
Lines changed: 9 additions & 6 deletions b/‎lib/matplotlib/colorbar.py‎
Lines changed: 9 additions & 6 deletions
diff --git a/‎lib/matplotlib/tests/baseline_images/test_colorbar/bivar_cbar_locationing.png‎
-16.1 KB b/‎lib/matplotlib/tests/baseline_images/test_colorbar/bivar_cbar_locationing.png‎
-16.1 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_colorbar/bivar_cbar_locationing_constrained-failed-diff.png‎
20 KB b/‎lib/matplotlib/tests/baseline_images/test_colorbar/bivar_cbar_locationing_constrained-failed-diff.png‎
20 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_colorbar/bivar_cbar_locationing_constrained.png‎
-14.4 KB b/‎lib/matplotlib/tests/baseline_images/test_colorbar/bivar_cbar_locationing_constrained.png‎
-14.4 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_colorbar/bivar_cbar_locationing_gridspec.png‎
18.9 KB b/‎lib/matplotlib/tests/baseline_images/test_colorbar/bivar_cbar_locationing_gridspec.png‎
18.9 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_colorbar/bivar_cbar_not_rasterized-failed-diff.png‎
694 Bytes b/‎lib/matplotlib/tests/baseline_images/test_colorbar/bivar_cbar_not_rasterized-failed-diff.png‎
694 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_colorbar/bivar_cbar_not_rasterized.png‎
-241 Bytes b/‎lib/matplotlib/tests/baseline_images/test_colorbar/bivar_cbar_not_rasterized.png‎
-241 Bytes
diff --git a/‎lib/matplotlib/tests/baseline_images/test_colorbar/bivar_cbar_sharing.png‎
-7.75 KB b/‎lib/matplotlib/tests/baseline_images/test_colorbar/bivar_cbar_sharing.png‎
-7.75 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_colorbar/multivar_cbar_locationing.png‎
-17.5 KB b/‎lib/matplotlib/tests/baseline_images/test_colorbar/multivar_cbar_locationing.png‎
-17.5 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_colorbar/multivar_cbar_locationing_constrained-failed-diff.png‎
30.5 KB b/‎lib/matplotlib/tests/baseline_images/test_colorbar/multivar_cbar_locationing_constrained-failed-diff.png‎
30.5 KB
@@ -1559,21 +1559,24 @@ def _draw_all(self):
                 rasterized=rasterized,
                 edgecolors='none', shading='flat')
         # Apply norm scaling (supports LogNorm etc.)
-        try:
+        if getattr(self.colorizer.norm.norms[0], '_scale', None):
+            # use the norm's scale (if it exists and is not None):
             self.ax.set_yscale(self.colorizer.norm.norms[0]._scale)
-        except TypeError:
-            # fallback for custom norms
+        else:
+            # fallback for custom norms, or NoNorm()
             self.ax.set_yscale(
                 'function',
                 functions=(
                     self.colorizer.norm.norms[0],
                     self.colorizer.norm.norms[0].inverse
                 )
             )
-        try:
+
+        if getattr(self.colorizer.norm.norms[1], '_scale', None):
+            # use the norm's scale (if it exists and is not None):
             self.ax.set_xscale(self.colorizer.norm.norms[1]._scale)
-        except TypeError:
-            # fallback for custom norms
+        else:
+            # fallback for custom norms, or NoNorm()
             self.ax.set_xscale(
                 'function',
                 functions=(