Fix linting for and _validate_linestyle_or_None to mypy allowlist

konmenel · konmenel · commit a4e6f44d12c2 · 2025-01-28T14:04:54.000Z
diff --git a/ci/mypy-stubtest-allowlist.txt b/ci/mypy-stubtest-allowlist.txt
@@ -5,6 +5,7 @@ matplotlib\.pylab(\..*)?
 matplotlib\._.*
 matplotlib\.rcsetup\._listify_validator
 matplotlib\.rcsetup\._validate_linestyle
+matplotlib\.rcsetup\._validate_linestyle_or_None
 matplotlib\.ft2font\.Glyph
 matplotlib\.testing\.jpl_units\..*
 matplotlib\.sphinxext(\..*)?
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -155,9 +155,11 @@ def __init__(
             # otherwise `grid(color=(1, 1, 1, 0.5))` would work like
             #   grid(color=(1, 1, 1, 0.5), alpha=rcParams['grid.alpha'])
             # so the that the rcParams default would override color alpha.
+
             grid_alpha = (
-                    mpl._val_or_rc(
-                    mpl.rcParams[f"grid.{xaxis_yaxis}.{major_minor}.alpha"], # grid_alpha is None
+                # grid_alpha is None so we can use the first key
+                mpl._val_or_rc(
+                    mpl.rcParams[f"grid.{xaxis_yaxis}.{major_minor}.alpha"],
                     f"grid.{major_minor}.alpha",
                     "grid.alpha",
                 )
