Merge pull request #23596 from oscargus/mplaxescleanup

timhoffm · web-flow · commit 0a4866f98690 · 2022-08-11T15:56:00.000+02:00
Minor cleanup of axes_grid1
diff --git a/lib/mpl_toolkits/axes_grid1/axes_grid.py b/lib/mpl_toolkits/axes_grid1/axes_grid.py
@@ -20,7 +20,6 @@ def _tick_only(ax, bottom_on, left_on):
 class CbarAxesBase:
     def __init__(self, *args, orientation, **kwargs):
         self.orientation = orientation
-        self._default_label_on = True
         self._locator = None  # deprecated.
         super().__init__(*args, **kwargs)
 
@@ -33,7 +32,6 @@ def colorbar(self, mappable, *, ticks=None, **kwargs):
         return cb
 
     def toggle_label(self, b):
-        self._default_label_on = b
         axis = self.axis[self.orientation]
         axis.toggle(ticklabels=b, label=b)
 
diff --git a/lib/mpl_toolkits/axes_grid1/mpl_axes.py b/lib/mpl_toolkits/axes_grid1/mpl_axes.py
@@ -112,14 +112,11 @@ def toggle(self, all=None, ticks=None, ticklabels=None, label=None):
         if label is not None:
             _label = label
 
-        tickOn = "tick%dOn" % self._axisnum
-        labelOn = "label%dOn" % self._axisnum
-
         if _ticks is not None:
-            tickparam = {tickOn: _ticks}
+            tickparam = {f"tick{self._axisnum}On": _ticks}
             self._axis.set_tick_params(**tickparam)
         if _ticklabels is not None:
-            tickparam = {labelOn: _ticklabels}
+            tickparam = {f"label{self._axisnum}On": _ticklabels}
             self._axis.set_tick_params(**tickparam)
 
         if _label is not None:
