Backport PR matplotlib#31920: Fix various small type hint issues

Author: timhoffm

ci/mypy-stubtest-allowlist.txt

@@ -3,7 +3,6 @@ matplotlib\.backends\..*
 matplotlib\.tests(\..*)?
 matplotlib\.pylab(\..*)?
 matplotlib\._.*
-matplotlib\.rcsetup\._listify_validator
 matplotlib\.rcsetup\._validate_linestyle
 matplotlib\.ft2font\.Glyph
 matplotlib\.ft2font\.LayoutItem

lib/matplotlib/artist.pyi

@@ -23,8 +23,8 @@ _T_Artist = TypeVar("_T_Artist", bound=Artist)
 def allow_rasterization(draw): ...
 
 class _XYPair(NamedTuple):
-    x: ArrayLike
-    y: ArrayLike
+    x: list[float]
+    y: list[float]
 
 class Artist:
     zorder: float

lib/matplotlib/axes/_base.pyi

@@ -67,7 +67,7 @@ class _AxesBase(martist.Artist):
 
     def __init__(
         self,
-        fig: Figure,
+        fig: Figure | SubFigure,
         *args: tuple[float, float, float, float] | Bbox | int,
         facecolor: ColorType | None = ...,
         frameon: bool = ...,

lib/matplotlib/backends/registry.pyi

@@ -25,7 +25,7 @@ class BackendRegistry:
     def backend_for_gui_framework(self, framework: str) -> str | None: ...
     def is_valid_backend(self, backend: str) -> bool: ...
     def list_all(self) -> list[str]: ...
-    def list_builtin(self, filter_: BackendFilter | None) -> list[str]: ...
+    def list_builtin(self, filter_: BackendFilter | None = ...) -> list[str]: ...
     def list_gui_frameworks(self) -> list[str]: ...
     def load_backend_module(self, backend: str) -> ModuleType: ...
     def resolve_backend(self, backend: str | None) -> tuple[str, str | None]: ...

lib/matplotlib/colorbar.pyi

@@ -13,11 +13,12 @@ from collections.abc import Sequence
 from typing import Any, Literal, overload
 from .typing import ColorType
 
-class _ColorbarSpine(mspines.Spines):
+
+class _ColorbarSpine(mspines.Spine):
     def __init__(self, axes: Axes): ...
-    def get_window_extent(self, renderer: RendererBase | None = ...) -> Bbox:...
+    def get_window_extent(self, renderer: RendererBase | None = ...) -> Bbox: ...
     def set_xy(self, xy: ArrayLike) -> None: ...
-    def draw(self, renderer: RendererBase | None) -> None:...
+    def draw(self, renderer: RendererBase | None) -> None: ...
 
 
 class Colorbar:

lib/matplotlib/font_manager.pyi

@@ -147,7 +147,7 @@ class FontManager:
         rebuild_if_missing: bool = ...,
     ) -> list[FontPath]: ...
 
-def is_opentype_cff_font(filename: str) -> bool: ...
+def is_opentype_cff_font(filename: str | os.PathLike) -> bool: ...
 def get_font(
     font_filepaths: Iterable[str | bytes | os.PathLike | FontPath] | str | bytes | os.PathLike | FontPath,
 ) -> ft2font.FT2Font: ...

lib/matplotlib/image.pyi

@@ -84,7 +84,7 @@ class _ImageBase(colorizer.ColorizingArtist):
         self, renderer: RendererBase, magnification: float = ..., unsampled: bool = ...
     ) -> tuple[np.ndarray, float, float, Affine2D]: ...
     def draw(self, renderer: RendererBase) -> None: ...
-    def write_png(self, fname: str | pathlib.Path | BinaryIO) -> None: ...
+    def write_png(self, fname: str | os.PathLike | BinaryIO) -> None: ...
     def set_data(self, A: ArrayLike | None) -> None: ...
     def set_array(self, A: ArrayLike | None) -> None: ...
     def get_shape(self) -> tuple[int, int, int]: ...

lib/matplotlib/rcsetup.pyi

@@ -7,7 +7,13 @@ from matplotlib.typing import ColorType, LineStyleType, MarkEveryType
 
 _T = TypeVar("_T")
 
-def _listify_validator(s: Callable[[Any], _T]) -> Callable[[Any], list[_T]]: ...
+def _listify_validator(
+    scalar_validator: Callable[[Any], _T],
+    allow_stringlist: bool = ...,
+    *,
+    n: int | None = ...,
+    doc: str | None = ...,
+) -> Callable[[Any], list[_T]]: ...
 
 class ValidateInStrings:
     key: str

lib/matplotlib/testing/compare.pyi

@@ -1,18 +1,19 @@
 from collections.abc import Callable
+from os import PathLike
 from typing import Literal, overload
 
 from numpy.typing import NDArray
 
 __all__ = ["calculate_rms", "comparable_formats", "compare_images"]
 
-def make_test_filename(fname: str, purpose: str) -> str: ...
+def make_test_filename(fname: str | PathLike, purpose: str) -> str: ...
 def get_cache_dir() -> str: ...
 def get_file_hash(path: str, block_size: int = ...) -> str: ...
 
 converter: dict[str, Callable[[str, str], None]] = {}
 
 def comparable_formats() -> list[str]: ...
-def convert(filename: str, cache: bool) -> str: ...
+def convert(filename: str | PathLike, cache: bool) -> str: ...
 def crop_to_same(
     actual_path: str, actual_image: NDArray, expected_path: str, expected_image: NDArray
 ) -> tuple[NDArray, NDArray]: ...

lib/matplotlib/transforms.py

@@ -156,7 +156,7 @@ def invalidate(self):
         Invalidate this `TransformNode` and triggers an invalidation of its
         ancestors.  Should be called any time the transform changes.
         """
-        return self._invalidate_internal(
+        self._invalidate_internal(
             level=self._INVALID_AFFINE_ONLY if self.is_affine else self._INVALID_FULL,
             invalidating_node=self)