Merge pull request matplotlib#26407 from QuLogic/better-typing

Improve some smaller typing issues

Author: tacaswell

lib/matplotlib/__init__.pyi

@@ -39,18 +39,16 @@ from packaging.version import Version
 from matplotlib._api import MatplotlibDeprecationWarning
 from typing import Any, NamedTuple
 
-__bibtex__: str
-
 class _VersionInfo(NamedTuple):
     major: int
     minor: int
     micro: int
     releaselevel: str
     serial: int
 
-class __getattr__:
-    __version__: str
-    __version_info__: _VersionInfo
+__bibtex__: str
+__version__: str
+__version_info__: _VersionInfo
 
 def set_loglevel(level: str) -> None: ...
 

lib/matplotlib/animation.pyi

@@ -162,7 +162,7 @@ class Animation:
     def save(
         self,
         filename: str | Path,
-        writer: MovieWriter | str | None = ...,
+        writer: AbstractMovieWriter | str | None = ...,
         fps: int | None = ...,
         dpi: float | None = ...,
         codec: str | None = ...,
@@ -183,6 +183,7 @@ class Animation:
         embed_frames: bool = ...,
         default_mode: str | None = ...,
     ) -> str: ...
+    def _repr_html_(self) -> str: ...
     def pause(self) -> None: ...
     def resume(self) -> None: ...
 

lib/matplotlib/artist.py

@@ -757,8 +757,7 @@ def set_clip_box(self, clipbox):
 
         Parameters
         ----------
-        clipbox : `.Bbox`
-
+        clipbox : `.BboxBase` or None
             Typically would be created from a `.TransformedBbox`. For
             instance ``TransformedBbox(Bbox([[0, 0], [1, 1]]), ax.transAxes)``
             is the default clipping for an artist added to an Axes.

lib/matplotlib/artist.pyi

@@ -5,6 +5,7 @@ from .path import Path
 from .patches import Patch
 from .patheffects import AbstractPathEffect
 from .transforms import (
+    BboxBase,
     Bbox,
     Transform,
     TransformedPatchPath,
@@ -27,10 +28,9 @@ class _Unset: ...
 
 class Artist:
     zorder: float
-    def __init_subclass__(cls): ...
     stale_callback: Callable[[Artist, bool], None] | None
     figure: Figure | SubFigure | None
-    clipbox: Bbox | None
+    clipbox: BboxBase | None
     def __init__(self) -> None: ...
     def remove(self) -> None: ...
     def have_units(self) -> bool: ...
@@ -51,7 +51,7 @@ class Artist:
     def remove_callback(self, oid: int) -> None: ...
     def pchanged(self) -> None: ...
     def is_transform_set(self) -> bool: ...
-    def set_transform(self, t: Transform) -> None: ...
+    def set_transform(self, t: Transform | None) -> None: ...
     def get_transform(self) -> Transform: ...
     def get_children(self) -> list[Artist]: ...
     # TODO can these dicts be type narrowed? e.g. str keys
@@ -87,7 +87,7 @@ class Artist:
     def get_path_effects(self) -> list[AbstractPathEffect]: ...
     def get_figure(self) -> Figure | None: ...
     def set_figure(self, fig: Figure) -> None: ...
-    def set_clip_box(self, clipbox: Bbox) -> None: ...
+    def set_clip_box(self, clipbox: BboxBase | None) -> None: ...
     def set_clip_path(
         self,
         path: Patch | Path | TransformedPath | TransformedPatchPath | None,

lib/matplotlib/axes/_axes.pyi

@@ -52,7 +52,7 @@ class Axes(_AxesBase):
     def get_legend_handles_labels(
         self, legend_handler_map: dict[type, HandlerBase] | None = ...
     ) -> tuple[list[Artist], list[Any]]: ...
-    legend_: Legend
+    legend_: Legend | None
 
     @overload
     def legend(self) -> Legend: ...
@@ -433,7 +433,7 @@ class Axes(_AxesBase):
         alpha: float | None = ...,
         linewidths: float | None = ...,
         edgecolors: Literal["face", "none"] | ColorType = ...,
-        reduce_C_function: Callable[[np.ndarray], float] = ...,
+        reduce_C_function: Callable[[np.ndarray | list[float]], float] = ...,
         mincnt: int | None = ...,
         marginals: bool = ...,
         *,

lib/matplotlib/axes/_base.pyi

@@ -131,8 +131,8 @@ class _AxesBase(martist.Artist):
             self,
             axes: _AxesBase,
             prop_name: str,
-            valid_types: list[type] | None = ...,
-            invalid_types: tuple[type] | None = ...,
+            valid_types: type | Iterable[type] | None = ...,
+            invalid_types: type | Iterable[type] | None = ...,
         ) -> None: ...
         def __len__(self) -> int: ...
         def __iter__(self) -> Iterator[Artist]: ...

lib/matplotlib/backend_bases.pyi

@@ -16,7 +16,7 @@ from matplotlib.font_manager import FontProperties
 from matplotlib.path import Path
 from matplotlib.texmanager import TexManager
 from matplotlib.text import Text
-from matplotlib.transforms import Transform, TransformedPath, Bbox
+from matplotlib.transforms import Bbox, BboxBase, Transform, TransformedPath
 
 from collections.abc import Callable, Iterable, Sequence
 from typing import Any, IO, Literal, NamedTuple, TypeVar
@@ -168,7 +168,7 @@ class GraphicsContextBase:
     def set_url(self, url: str | None) -> None: ...
     def set_gid(self, id: int | None) -> None: ...
     def set_snap(self, snap: bool | None) -> None: ...
-    def set_hatch(self, hatch: str) -> None: ...
+    def set_hatch(self, hatch: str | None) -> None: ...
     def get_hatch(self) -> str | None: ...
     def get_hatch_path(self, density: float = ...) -> Path: ...
     def get_hatch_color(self) -> ColorType: ...
@@ -323,7 +323,7 @@ class FigureCanvasBase:
     @classmethod
     def new_manager(cls, figure: Figure, num: int | str): ...
     def is_saving(self) -> bool: ...
-    def blit(self, bbox: Bbox | None = ...) -> None: ...
+    def blit(self, bbox: BboxBase | None = ...) -> None: ...
     def inaxes(self, xy: tuple[float, float]) -> Axes | None: ...
     def grab_mouse(self, ax: Axes) -> None: ...
     def release_mouse(self, ax: Axes) -> None: ...
@@ -386,8 +386,8 @@ class FigureManagerBase:
     num: int | str
     key_press_handler_id: int | None
     button_press_handler_id: int | None
-    toolmanager: ToolManager
-    toolbar: NavigationToolbar2
+    toolmanager: ToolManager | None
+    toolbar: NavigationToolbar2 | ToolContainerBase | None
     def __init__(self, canvas: FigureCanvasBase, num: int | str) -> None: ...
     @classmethod
     def create_with_canvas(
@@ -429,7 +429,7 @@ class NavigationToolbar2:
 
     class _PanInfo(NamedTuple):
         button: MouseButton
-        axes: Axes
+        axes: list[Axes]
         cid: int
     def press_pan(self, event: Event) -> None: ...
     def drag_pan(self, event: Event) -> None: ...
@@ -439,7 +439,7 @@ class NavigationToolbar2:
     class _ZoomInfo(NamedTuple):
         direction: Literal["in", "out"]
         start_xy: tuple[float, float]
-        axes: Axes
+        axes: list[Axes]
         cid: int
         cbar: Colorbar
     def press_zoom(self, event: Event) -> None: ...

lib/matplotlib/backend_managers.pyi

@@ -52,13 +52,13 @@ class ToolManager:
     def add_tool(self, name: str, tool: type[_T], *args, **kwargs) -> _T: ...
     def trigger_tool(
         self,
-        name: str,
+        name: str | backend_tools.ToolBase,
         sender: Any | None = ...,
         canvasevent: ToolEvent | None = ...,
         data: Any | None = ...,
     ) -> None: ...
     @property
     def tools(self) -> dict[str, backend_tools.ToolBase]: ...
     def get_tool(
-        self, name: str, warn: bool = ...
+        self, name: str | backend_tools.ToolBase, warn: bool = ...
     ) -> backend_tools.ToolBase | None: ...

lib/matplotlib/colorbar.pyi

@@ -23,7 +23,7 @@ class Colorbar:
     n_rasterize: int
     mappable: cm.ScalarMappable
     ax: Axes
-    alpha: float
+    alpha: float | None
     cmap: colors.Colormap
     norm: colors.Normalize
     values: Sequence[float] | None

lib/matplotlib/colors.pyi

@@ -97,6 +97,8 @@ class Colormap:
     def is_gray(self) -> bool: ...
     def resampled(self, lutsize: int) -> Colormap: ...
     def reversed(self, name: str | None = ...) -> Colormap: ...
+    def _repr_html_(self) -> str: ...
+    def _repr_png_(self) -> bytes: ...
     def copy(self) -> Colormap: ...
 
 class LinearSegmentedColormap(Colormap):