Remove unnecessary gca management in Figure.colorbar.

anntzer · anntzer · commit a7cb796fce9b · 2023-01-17T16:45:21.000+01:00
colorbar() doesn't modify the current axes (anymore?).
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1257,27 +1257,18 @@ def colorbar(
                     'the Colorbar, provide the *ax* argument to steal space '
                     'from it, or add *mappable* to an Axes.'))
                 ax = self.gca()
-            current_ax = self.gca()
-            userax = False
             if (use_gridspec
                     and isinstance(ax, mpl.axes._base._AxesBase)
                     and ax.get_subplotspec()):
                 cax, kwargs = cbar.make_axes_gridspec(ax, **kwargs)
             else:
                 cax, kwargs = cbar.make_axes(ax, **kwargs)
             cax.grid(visible=False, which='both', axis='both')
-        else:
-            userax = True
-
-        # need to remove kws that cannot be passed to Colorbar
-        NON_COLORBAR_KEYS = ['fraction', 'pad', 'shrink', 'aspect', 'anchor',
-                             'panchor']
-        cb_kw = {k: v for k, v in kwargs.items() if k not in NON_COLORBAR_KEYS}
-
-        cb = cbar.Colorbar(cax, mappable, **cb_kw)
 
-        if not userax:
-            self.sca(current_ax)
+        NON_COLORBAR_KEYS = [  # remove kws that cannot be passed to Colorbar
+            'fraction', 'pad', 'shrink', 'aspect', 'anchor', 'panchor']
+        cb = cbar.Colorbar(cax, mappable, **{
+            k: v for k, v in kwargs.items() if k not in NON_COLORBAR_KEYS})
         self.stale = True
         return cb
 
