Merge pull request #24994 from oscargus/axismap

anntzer · web-flow · commit 5619747729d2 · 2023-01-26T00:18:46.000+01:00
Use `_axis_map` instead of `getattr` in `Axes` and `Figure`
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3670,7 +3670,7 @@ def apply_mask(arrays, mask):
                     continue
                 hlmarker = (
                     himarker
-                    if getattr(self, f"{dep_axis}axis").get_inverted() ^ idx
+                    if self._axis_map[dep_axis].get_inverted() ^ idx
                     else lomarker)
                 x_masked, y_masked, hl_masked = apply_mask(
                     [x, y, hl], lims & everymask)
@@ -4275,7 +4275,7 @@ def do_patch(xs, ys, **kwargs):
         if manage_ticks:
             axis_name = "x" if vert else "y"
             interval = getattr(self.dataLim, f"interval{axis_name}")
-            axis = getattr(self, f"{axis_name}axis")
+            axis = self._axis_map[axis_name]
             positions = axis.convert_units(positions)
             # The 0.5 additional padding ensures reasonable-looking boxes
             # even when drawing a single box.  We set the sticky edge to
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -925,7 +925,7 @@ def _break_share_link(ax, grouper):
         for name in ax._axis_names:
             last_ax = _break_share_link(ax, ax._shared_axes[name])
             if last_ax is not None:
-                _reset_locators_and_formatters(getattr(last_ax, f"{name}axis"))
+                _reset_locators_and_formatters(last_ax._axis_map[name])
 
         # Break link between any twinned axes
         _break_share_link(ax, ax._twinned_axes)
