Best practices for type hint stub files (flake8-pyi)

Author: ksunden

lib/matplotlib/__init__.pyi

@@ -32,14 +32,14 @@ import os
 from pathlib import Path
 
 from . import cbook, rcsetup
-from collections.abc import Generator, MutableMapping
+from collections.abc import Callable, Generator, MutableMapping
 import contextlib
 from packaging.version import Version
 
 from matplotlib._api import MatplotlibDeprecationWarning
 from matplotlib.cbook import sanitize_sequence
 from matplotlib.rcsetup import cycler, validate_backend
-from typing import Any, Callable, NamedTuple
+from typing import Any, NamedTuple
 
 __bibtex__: str
 

lib/matplotlib/_path.pyi

@@ -1,4 +1,4 @@
-from typing import Sequence
+from collections.abc import Sequence
 import numpy as np
 from .transforms import BboxBase
 

lib/matplotlib/animation.pyi

@@ -1,5 +1,5 @@
 import abc
-from collections.abc import Generator
+from collections.abc import Callable, Iterable, Generator
 import contextlib
 from pathlib import Path
 from matplotlib import cbook
@@ -13,7 +13,7 @@ from matplotlib.artist import Artist
 from matplotlib.backend_bases import TimerBase
 from matplotlib.figure import Figure
 
-from typing import Any, Callable, Iterable, Generator, Type
+from typing import Any
 
 subprocess_creation_flags: int
 
@@ -23,11 +23,11 @@ class MovieWriterRegistry:
     def __init__(self) -> None: ...
     def register(
         self, name: str
-    ) -> Callable[[Type[AbstractMovieWriter]], Type[AbstractMovieWriter]]: ...
+    ) -> Callable[[type[AbstractMovieWriter]], type[AbstractMovieWriter]]: ...
     def is_available(self, name: str) -> bool: ...
     def __iter__(self) -> Generator[str, None, None]: ...
     def list(self) -> list[str]: ...
-    def __getitem__(self, name: str) -> Type[AbstractMovieWriter]: ...
+    def __getitem__(self, name: str) -> type[AbstractMovieWriter]: ...
 
 writers: MovieWriterRegistry
 

lib/matplotlib/artist.pyi

@@ -19,7 +19,8 @@ from .transforms import (
 
 import numpy as np
 
-from typing import Any, NamedTuple, Callable, TextIO, Type, TypeVar, overload
+from collections.abc import Callable
+from typing import Any, NamedTuple, TextIO, overload
 from numpy.typing import ArrayLike
 
 def allow_rasterization(draw): ...
@@ -135,7 +136,7 @@ class Artist:
     def set(self, **kwargs: Any): ...
     def findobj(
         self,
-        match: None | Callable[[Artist], bool] | Type[Artist] = ...,
+        match: None | Callable[[Artist], bool] | type[Artist] = ...,
         include_self: bool = ...,
     ) -> list[Artist]: ...
     def get_cursor_data(self, event: MouseEvent) -> Any: ...
@@ -144,8 +145,8 @@ class Artist:
     def set_mouseover(self, mouseover: bool) -> None: ...
 
 class ArtistInspector:
-    oorig: Artist | Type[Artist]
-    o: Type[Artist]
+    oorig: Artist | type[Artist]
+    o: type[Artist]
     aliasd: dict[str, set[str]]
     def __init__(self, o) -> None: ...
     def get_aliases(self) -> dict[str, set[str]]: ...

lib/matplotlib/axes/_axes.pyi

@@ -32,7 +32,8 @@ import matplotlib.streamplot as mstream
 
 import datetime
 import PIL
-from typing import Any, Callable, Literal, Sequence, Type, overload
+from collections.abc import Callable, Sequence
+from typing import Any, Literal, overload
 import numpy as np
 from numpy.typing import ArrayLike
 
@@ -49,7 +50,7 @@ class Axes(_AxesBase):
         **kwargs
     ) -> Text: ...
     def get_legend_handles_labels(
-        self, legend_handler_map: dict[Type, HandlerBase] | None = ...
+        self, legend_handler_map: dict[type, HandlerBase] | None = ...
     ) -> tuple[list[Artist], list[Any]]: ...
     legend_: Legend
 

lib/matplotlib/axes/_base.pyi

@@ -1,7 +1,7 @@
 import matplotlib.artist as martist
 
 import datetime
-from collections.abc import MutableSequence
+from collections.abc import Callable, Iterable, Iterator, Sequence, MutableSequence
 from matplotlib import cbook, offsetbox
 from matplotlib.artist import Artist
 from matplotlib.axis import XAxis, YAxis, Tick
@@ -28,7 +28,7 @@ from cycler import Cycler
 
 import numpy as np
 from numpy.typing import ArrayLike
-from typing import Any, Callable, Literal, Iterable, Iterator, Sequence, Type, overload
+from typing import Any, Literal, overload
 
 class _axis_method_wrapper:
     attr_name: str
@@ -129,8 +129,8 @@ class _AxesBase(martist.Artist):
             self,
             axes: _AxesBase,
             prop_name: str,
-            valid_types: list[Type] | None = ...,
-            invalid_types: tuple[Type] | None = ...,
+            valid_types: list[type] | None = ...,
+            invalid_types: tuple[type] | None = ...,
         ) -> None: ...
         def __len__(self) -> int: ...
         def __iter__(self) -> Iterator[Artist]: ...

lib/matplotlib/axes/_secondary_axes.pyi

@@ -4,7 +4,8 @@ from matplotlib.axis import Axis, Tick
 from matplotlib.colors import Color
 from matplotlib.transforms import Transform
 
-from typing import Literal, Callable, Iterable
+from collections.abc import Callable, Iterable
+from typing import Literal
 from numpy.typing import ArrayLike
 
 class SecondaryAxis(_AxesBase):

lib/matplotlib/axis.pyi

@@ -9,7 +9,8 @@ from matplotlib.ticker import Locator, Formatter
 from matplotlib.transforms import Transform, Bbox
 
 import datetime
-from typing import Any, Literal, Type, Iterable, Callable
+from collections.abc import Callable, Iterable
+from typing import Any, Literal
 import numpy as np
 from numpy.typing import ArrayLike
 
@@ -93,7 +94,7 @@ class Ticker:
 
 class _LazyTickList:
     def __init__(self, major: bool) -> None: ...
-    def __get__(self, instance: Axis, cls: Type): ...
+    def __get__(self, instance: Axis, cls: type): ...
 
 class Axis(martist.Artist):
     OFFSETTEXTPAD: int

lib/matplotlib/backend_bases.pyi

@@ -28,13 +28,14 @@ from matplotlib.texmanager import TexManager
 from matplotlib.text import Text
 from matplotlib.transforms import Affine2D, Transform, TransformedPath, Bbox
 
-from typing import Any, Callable, Literal, NamedTuple, Sequence, Type, TypeVar
+from collections.abc import Callable, Sequence
+from typing import Any, Literal, NamedTuple, TypeVar
 from numpy.typing import ArrayLike
 
 def register_backend(
-    format: str, backend: str | Type[FigureCanvasBase], description: str | None = ...
+    format: str, backend: str | type[FigureCanvasBase], description: str | None = ...
 ) -> None: ...
-def get_registered_canvas_class(format: str) -> Type[FigureCanvasBase]: ...
+def get_registered_canvas_class(format: str) -> type[FigureCanvasBase]: ...
 
 class RendererBase:
     def __init__(self) -> None: ...
@@ -302,7 +303,7 @@ class FigureCanvasBase:
     required_interactive_framework: str | None
 
     @_api.classproperty
-    def manager_class(cls) -> Type[FigureManagerBase]: ...
+    def manager_class(cls) -> type[FigureManagerBase]: ...
     events: list[str]
     fixed_dpi: None | float
     filetypes: dict[str, str]
@@ -358,8 +359,8 @@ class FigureCanvasBase:
     @classmethod
     def get_default_filetype(cls) -> str: ...
     def get_default_filename(self) -> str: ...
-    T = TypeVar("T", bound=FigureCanvasBase)
-    def switch_backends(self, FigureCanvasClass: Type[T]) -> T: ...
+    _T = TypeVar("_T", bound=FigureCanvasBase)
+    def switch_backends(self, FigureCanvasClass: type[_T]) -> _T: ...
     def mpl_connect(self, s: str, func: Callable[[Event], Any]) -> int: ...
     def mpl_disconnect(self, cid: int) -> None: ...
     def new_timer(
@@ -394,7 +395,7 @@ class FigureManagerBase:
     def __init__(self, canvas: FigureCanvasBase, num: int | str) -> None: ...
     @classmethod
     def create_with_canvas(
-        cls, canvas_class: Type[FigureCanvasBase], figure: Figure, num: int | str
+        cls, canvas_class: type[FigureCanvasBase], figure: Figure, num: int | str
     ): ...
     @classmethod
     def start_main_loop(cls) -> None: ...
@@ -475,8 +476,8 @@ class ToolContainerBase:
 
 class _Backend:
     backend_version: str
-    FigureCanvas: Type[FigureCanvasBase]
-    FigureManager: Type[FigureManagerBase]
+    FigureCanvas: type[FigureCanvasBase]
+    FigureManager: type[FigureManagerBase]
     mainloop: None | Callable[[], Any]
     @classmethod
     def new_figure_manager(cls, num: int | str, *args, **kwargs): ...
@@ -487,7 +488,7 @@ class _Backend:
     @classmethod
     def show(cls, *, block: bool | None = ...) -> None: ...
     @staticmethod
-    def export(cls) -> Type[_Backend]: ...
+    def export(cls) -> type[_Backend]: ...
 
 class ShowBase(_Backend):
     def __call__(self, block: bool | None = ...): ...

lib/matplotlib/backend_managers.pyi

@@ -1,8 +1,9 @@
-from matplotlib import backend_tools, cbook, widgets
+from matplotlib import backend_tools, widgets
 from matplotlib.backend_bases import FigureCanvasBase
 from matplotlib.figure import Figure
 
-from typing import Any, Callable, Iterable, TypeVar, Type
+from collections.abc import Callable, Iterable
+from typing import Any, TypeVar
 
 class ToolEvent:
     name: str
@@ -47,8 +48,8 @@ class ToolManager:
     def get_tool_keymap(self, name: str) -> list[str]: ...
     def update_keymap(self, name: str, key: str | Iterable[str]) -> None: ...
     def remove_tool(self, name: str) -> None: ...
-    T = TypeVar("T", bound=backend_tools.ToolBase)
-    def add_tool(self, name: str, tool: Type[T], *args, **kwargs) -> T: ...
+    _T = TypeVar("_T", bound=backend_tools.ToolBase)
+    def add_tool(self, name: str, tool: type[_T], *args, **kwargs) -> _T: ...
     def trigger_tool(
         self,
         name: str,