Handle suggestions in PR

Author: mdboom

lib/matplotlib/axes/_axes.pyi

@@ -23,6 +23,7 @@ from matplotlib.patches import Rectangle, FancyArrow, Polygon, StepPatch, Wedge
 from matplotlib.quiver import Quiver, QuiverKey, Barbs
 from matplotlib.text import Annotation, Text
 from matplotlib.transforms import Transform
+from matplotlib.typing import CoordsType
 import matplotlib.tri as mtri
 import matplotlib.table as mtable
 import matplotlib.stackplot as mstack
@@ -122,8 +123,8 @@ class Axes(_AxesBase):
         text: str,
         xy: tuple[float, float],
         xytext: tuple[float, float] | None = ...,
-        xycoords: coords_type = ...,
-        textcoords: coords_type | None = ...,
+        xycoords: CoordsType = ...,
+        textcoords: CoordsType | None = ...,
         arrowprops: dict[str, Any] | None = ...,
         annotation_clip: bool | None = ...,
         **kwargs

lib/matplotlib/axes/_base.py

@@ -7,15 +7,13 @@
 from operator import attrgetter
 import re
 import types
-from typing import Callable, Union
 
 import numpy as np
 
 import matplotlib as mpl
 from matplotlib import _api, cbook, _docstring, offsetbox
 import matplotlib.artist as martist
 import matplotlib.axis as maxis
-from matplotlib import backend_bases
 from matplotlib.cbook import _OrderedSet, _check_1d, index_of
 import matplotlib.collections as mcoll
 import matplotlib.colors as mcolors
@@ -34,21 +32,6 @@
 _log = logging.getLogger(__name__)
 
 
-coords_type_base = Union[
-    str,
-    martist.Artist,
-    mtransforms.Transform,
-    Callable[
-        [backend_bases.RendererBase],
-        Union[mtransforms.Bbox, mtransforms.Transform]
-    ]
-]
-coords_type = Union[
-    coords_type_base,
-    tuple[coords_type_base, coords_type_base]
-]
-
-
 class _axis_method_wrapper:
     """
     Helper to generate Axes methods wrapping Axis methods.

lib/matplotlib/axes/_base.pyi

@@ -29,9 +29,6 @@ from numpy.typing import ArrayLike
 from typing import Any, Literal, TypeVar, overload
 from matplotlib.typing import ColorType
 
-coords_type_base = str | Artist | Transform | Callable[[RendererBase], Bbox | Transform]
-coords_type = coords_type_base | tuple[coords_type_base, coords_type_base]
-
 _T = TypeVar("_T", bound=Artist)
 
 class _axis_method_wrapper:

lib/matplotlib/offsetbox.pyi

@@ -8,6 +8,7 @@ from matplotlib.font_manager import FontProperties
 from matplotlib.image import BboxImage
 from matplotlib.patches import FancyArrowPatch, FancyBboxPatch
 from matplotlib.transforms import Bbox, BboxBase, Transform
+from matplotlib.typing import CoordsType
 
 import numpy as np
 from numpy.typing import ArrayLike
@@ -220,7 +221,7 @@ class AnnotationBbox(martist.Artist, mtext._AnnotationBase):
     offsetbox: OffsetBox
     arrowprops: dict[str, Any] | None
     xybox: tuple[float, float]
-    boxcoords: coords_type
+    boxcoords: CoordsType
     arrow_patch: FancyArrowPatch | None
     patch: FancyBboxPatch
     prop: FontProperties
@@ -229,8 +230,8 @@ class AnnotationBbox(martist.Artist, mtext._AnnotationBase):
         offsetbox: OffsetBox,
         xy: tuple[float, float],
         xybox: tuple[float, float] | None = ...,
-        xycoords: coords_type = ...,
-        boxcoords: coords_type | None = ...,
+        xycoords: CoordsType = ...,
+        boxcoords: CoordsType | None = ...,
         *,
         frameon: bool = ...,
         pad: float = ...,
@@ -248,11 +249,11 @@ class AnnotationBbox(martist.Artist, mtext._AnnotationBase):
     @property
     def anncoords(
         self,
-    ) -> coords_type: ...
+    ) -> CoordsType: ...
     @anncoords.setter
     def anncoords(
         self,
-        coords: coords_type,
+        coords: CoordsType,
     ) -> None: ...
     def get_children(self) -> list[martist.Artist]: ...
     def set_figure(self, fig: Figure) -> None: ...

lib/matplotlib/pyplot.py

@@ -94,7 +94,7 @@
     import matplotlib.artist
     import matplotlib.backend_bases
     from matplotlib.axis import Tick
-    from matplotlib.axes._base import _AxesBase, coords_type
+    from matplotlib.axes._base import _AxesBase
     from matplotlib.backend_bases import Event
     from matplotlib.cm import ScalarMappable
     from matplotlib.contour import ContourSet, QuadContourSet
@@ -119,7 +119,7 @@
     from matplotlib.patches import FancyArrow, StepPatch, Wedge
     from matplotlib.quiver import Barbs, Quiver, QuiverKey
     from matplotlib.scale import ScaleBase
-    from matplotlib.typing import ColorType, LineStyleType, MarkerType, HashableList
+    from matplotlib.typing import ColorType, CoordsType, LineStyleType, MarkerType, HashableList
     from matplotlib.widgets import SubplotTool
 
     _P = ParamSpec('_P')
@@ -2857,8 +2857,8 @@ def annotate(
     text: str,
     xy: tuple[float, float],
     xytext: tuple[float, float] | None = None,
-    xycoords: coords_type = "data",
-    textcoords: coords_type | None = None,
+    xycoords: CoordsType = "data",
+    textcoords: CoordsType | None = None,
     arrowprops: dict[str, Any] | None = None,
     annotation_clip: bool | None = None,
     **kwargs,

lib/matplotlib/text.pyi

@@ -1,5 +1,4 @@
 from .artist import Artist
-from .axes._base import coords_type
 from .backend_bases import RendererBase
 from .font_manager import FontProperties
 from .offsetbox import DraggableAnnotation
@@ -17,7 +16,7 @@ from .transforms import (
 
 from collections.abc import Callable, Iterable
 from typing import Any, Literal
-from .typing import ColorType
+from .typing import ColorType, CoordsType
 
 class Text(Artist):
     zorder: float
@@ -121,11 +120,11 @@ class OffsetFrom:
 
 class _AnnotationBase:
     xy: tuple[float, float]
-    xycoords: coords_type
+    xycoords: CoordsType
     def __init__(
         self,
         xy,
-        xycoords: coords_type = ...,
+        xycoords: CoordsType = ...,
         annotation_clip: bool | None = ...,
     ) -> None: ...
     def set_annotation_clip(self, b: bool | None) -> None: ...
@@ -142,40 +141,40 @@ class Annotation(Text, _AnnotationBase):
         text: str,
         xy: tuple[float, float],
         xytext: tuple[float, float] | None = ...,
-        xycoords: coords_type = ...,
-        textcoords: coords_type | None = ...,
+        xycoords: CoordsType = ...,
+        textcoords: CoordsType | None = ...,
         arrowprops: dict[str, Any] | None = ...,
         annotation_clip: bool | None = ...,
         **kwargs
     ) -> None: ...
     @property
     def xycoords(
         self,
-    ) -> coords_type: ...
+    ) -> CoordsType: ...
     @xycoords.setter
     def xycoords(
         self,
-        xycoords: coords_type,
+        xycoords: CoordsType,
     ) -> None: ...
     @property
     def xyann(self) -> tuple[float, float]: ...
     @xyann.setter
     def xyann(self, xytext: tuple[float, float]) -> None: ...
     def get_anncoords(
         self,
-    ) -> coords_type: ...
+    ) -> CoordsType: ...
     def set_anncoords(
         self,
-        coords: coords_type,
+        coords: CoordsType,
     ) -> None: ...
     @property
     def anncoords(
         self,
-    ) -> coords_type: ...
+    ) -> CoordsType: ...
     @anncoords.setter
     def anncoords(
         self,
-        coords: coords_type,
+        coords: CoordsType,
     ) -> None: ...
     def update_positions(self, renderer: RendererBase) -> None: ...
     # Drops `dpi` parameter from superclass

lib/matplotlib/typing.py

@@ -11,11 +11,14 @@
 """
 from collections.abc import Hashable, Sequence
 import pathlib
-from typing import Any, Literal, TypeVar, Union
+from typing import Any, Callable, Literal, TypeVar, Union
 
 from . import path
 from ._enums import JoinStyle, CapStyle
+from .artist import Artist
+from .backend_bases import RendererBase
 from .markers import MarkerStyle
+from .transforms import Bbox, Transform
 
 # The following are type aliases. Once python 3.9 is dropped, they should be annotated
 # using ``typing.TypeAlias`` and Unions should be converted to using ``|`` syntax.
@@ -48,6 +51,20 @@
 JoinStyleType = Union[JoinStyle, Literal["miter", "round", "bevel"]]
 CapStyleType = Union[CapStyle, Literal["butt", "projecting", "round"]]
 
+CoordsBaseType = Union[
+    str,
+    Artist,
+    Transform,
+    Callable[
+        [RendererBase],
+        Union[Bbox, Transform]
+    ]
+]
+CoordsType = Union[
+    CoordsBaseType,
+    tuple[CoordsBaseType, CoordsBaseType]
+]
+
 RcStyleType = Union[
     str,
     dict[str, Any],