FIX: review fixes

jklymak · jklymak · commit f739c489c24e · 2021-05-23T09:04:33.000-07:00
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -517,11 +517,8 @@ def draw_all(self):
         # Compute the X/Y mesh.
         X, Y, extendlen = self._mesh()
         # draw the extend triangles, and shrink the inner axes to accomodate.
-        # returns the outline of the axes in axes-relative units, including
-        # the extends:
-        xyout = self._do_extends(extendlen)
-        # set the spine outline from the above:
-        self.outline.set_xy(xyout)
+        # also adds the outline path to self.outline spine:
+        self._do_extends(extendlen)
 
         self.ax.set_xlim(self.vmin, self.vmax)
         self.ax.set_ylim(self.vmin, self.vmax)
@@ -611,8 +608,10 @@ def _do_extends(self, extendlen):
             xyout = xyout[:, ::-1]
         self.ax._set_inner_bounds(bounds)
 
+        # xyout is the path for the spine:
+        self.outline.set_xy(xyout)
         if not self.filled:
-            return xyout
+            return
 
         # Make extend triangles or rectangles filled patches.  These are
         # defined in the outer parent axes' co-ordinates:
@@ -655,7 +654,7 @@ def _do_extends(self, extendlen):
                 linewidth=0, antialiased=False,
                 transform=self.ax.outer_ax.transAxes, hatch=hatches[-1])
             self.ax.outer_ax.add_patch(patch)
-        return xyout
+        return
 
     def add_lines(self, levels, colors, linewidths, erase=True):
         """
@@ -796,7 +795,7 @@ def set_ticks(self, ticks, update_ticks=True):
 
     def get_ticks(self, minor=False):
         """
-        Return the x ticks as a list of locations.
+        Return the ticks as a list of locations.
 
         Parameters
         ----------
@@ -813,8 +812,17 @@ def set_ticklabels(self, ticklabels, update_ticks=True):
         """
         Set tick labels.
 
+        Parameters
+        ----------
+
+        ticklabels : sequence of str or of `.Text`
+            Texts for labeling each tick location in the sequence set by
+            `.Axis.set_ticks`; the number of labels must match the number of
+            locations.
+
         update_ticks : bool, default: True
             This keyword argument is ignored and will be be removed.
+            Deprecated
         """
         if isinstance(self.locator, ticker.FixedLocator):
             self.formatter = ticker.FixedFormatter(ticklabels)
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
@@ -88,10 +88,10 @@ def _colorbar_extension_length(spacing):
             # Create a subplot.
             cax = fig.add_subplot(12, 1, i*3 + j + 1)
             # Generate the colorbar.
-            cb = ColorbarBase(cax, cmap=cmap, norm=norm,
-                              boundaries=boundaries, values=values,
-                              extend=extension_type, extendfrac=extendfrac,
-                              orientation='horizontal', spacing=spacing)
+            ColorbarBase(cax, cmap=cmap, norm=norm,
+                         boundaries=boundaries, values=values,
+                         extend=extension_type, extendfrac=extendfrac,
+                         orientation='horizontal', spacing=spacing)
             # Turn off text and ticks.
             cax.tick_params(left=False, labelleft=False,
                               bottom=False, labelbottom=False)
@@ -310,7 +310,6 @@ def test_colorbar_minorticks_on_off():
 
         im.set_clim(vmin=-1.2, vmax=1.2)
         cbar.minorticks_on()
-        #fig.canvas.draw()
         np.testing.assert_almost_equal(
             cbar.ax.yaxis.get_minorticklocs(),
             [-1.1, -0.9, -0.8, -0.7, -0.6, -0.4, -0.3, -0.2, -0.1,
@@ -433,7 +432,7 @@ def test_colorbar_get_ticks():
     assert userTicks.get_ticks().tolist() == [600, 700, 800]
 
     # testing for getter after calling set_ticks with some ticks out of bounds
-    # removed #18900: other axes don't trim fixed lists, so colorbars
+    # removed #20054: other axes don't trim fixed lists, so colorbars
     # should not either:
     # userTicks.set_ticks([600, 1300, 1400, 1500])
     # assert userTicks.get_ticks().tolist() == [600]
