Merge pull request #21137 from anntzer/cb

greglucas · web-flow · commit 2b15797272f5 · 2021-09-20T07:05:03.000-06:00
Small cleanups to colorbar.
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -1106,18 +1106,14 @@ def _mesh(self):
         norm = copy.deepcopy(self.norm)
         norm.vmin = self.vmin
         norm.vmax = self.vmax
-        x = np.array([0.0, 1.0])
         y, extendlen = self._proportional_y()
         # invert:
-        if (isinstance(norm, (colors.BoundaryNorm, colors.NoNorm)) or
-                (self.__scale == 'manual')):
-            # if a norm doesn't have a named scale, or we are not using a norm:
-            dv = self.vmax - self.vmin
-            y = y * dv + self.vmin
+        if isinstance(norm, (colors.BoundaryNorm, colors.NoNorm)):
+            y = y * (self.vmax - self.vmin) + self.vmin  # not using a norm.
         else:
             y = norm.inverse(y)
         self._y = y
-        X, Y = np.meshgrid(x, y)
+        X, Y = np.meshgrid([0., 1.], y)
         if self.orientation == 'vertical':
             return (X, Y, extendlen)
         else:
@@ -1152,8 +1148,8 @@ def _reset_locator_formatter_scale(self):
                 self._set_scale('function', functions=funcs)
             elif self.spacing == 'proportional':
                 self._set_scale('linear')
-        elif hasattr(self.norm, '_scale') and self.norm._scale is not None:
-            # use the norm's scale:
+        elif getattr(self.norm, '_scale', None):
+            # use the norm's scale (if it exists and is not None):
             self._set_scale(self.norm._scale)
         elif type(self.norm) is colors.Normalize:
             # plain Normalize:
