Redistribute types defined in _typing to their logical homes

ksunden · ksunden · commit 94e6f7bb8d49 · 2023-03-30T12:31:22.000-05:00
diff --git a/lib/matplotlib/_color_data.pyi b/lib/matplotlib/_color_data.pyi
@@ -1,4 +1,4 @@
-from ._typing import Color
+from .colors import Color
 
 BASE_COLORS: dict[str, Color]
 TABLEAU_COLORS: dict[str, Color]
diff --git a/lib/matplotlib/axes/_axes.pyi b/lib/matplotlib/axes/_axes.pyi
@@ -12,13 +12,14 @@ from matplotlib.collections import (
     EventCollection,
     QuadMesh,
 )
-from matplotlib.colors import Colormap, Normalize
+from matplotlib.colors import Color, Colormap, Normalize
 from matplotlib.container import BarContainer, ErrorbarContainer, StemContainer
 from matplotlib.contour import ContourSet, QuadContourSet
 from matplotlib.image import AxesImage, PcolorImage
 from matplotlib.legend import Legend
 from matplotlib.legend_handler import HandlerBase
-from matplotlib.lines import Line2D
+from matplotlib.lines import Line2D, LineStyleType
+from matplotlib.markers import MarkerType
 from matplotlib.mlab import GaussianKDE
 from matplotlib.patches import Rectangle, FancyArrow, Polygon, StepPatch
 from matplotlib.quiver import Quiver, QuiverKey, Barbs
@@ -28,7 +29,6 @@ import matplotlib.tri as mtri
 import matplotlib.table as mtable
 import matplotlib.stackplot as mstack
 import matplotlib.streamplot as mstream
-from matplotlib._typing import Color, LineStyleType, MarkerType
 
 import datetime
 import PIL
diff --git a/lib/matplotlib/axes/_base.pyi b/lib/matplotlib/axes/_base.pyi
@@ -9,6 +9,7 @@ from matplotlib.backend_bases import RendererBase, MouseButton, MouseEvent
 from matplotlib.cbook import index_of
 from matplotlib.container import Container
 from matplotlib.collections import Collection
+from matplotlib.colors import Color
 from matplotlib.cm import ScalarMappable
 from matplotlib.legend import Legend
 from matplotlib.lines import Line2D
@@ -28,7 +29,6 @@ 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 matplotlib._typing import Color
 
 class _axis_method_wrapper:
     attr_name: str
diff --git a/lib/matplotlib/axes/_secondary_axes.pyi b/lib/matplotlib/axes/_secondary_axes.pyi
@@ -1,8 +1,8 @@
 from matplotlib.axes._base import _AxesBase
 from matplotlib.axis import Axis, Tick
 
+from matplotlib.colors import Color
 from matplotlib.transforms import Transform
-from matplotlib._typing import Color
 
 from typing import Literal, Callable, Iterable
 from numpy.typing import ArrayLike
diff --git a/lib/matplotlib/axis.pyi b/lib/matplotlib/axis.pyi
@@ -2,14 +2,14 @@ import matplotlib.artist as martist
 from matplotlib import cbook
 from matplotlib.axes import Axes
 from matplotlib.backend_bases import RendererBase
+from matplotlib.colors import Color
 from matplotlib.lines import Line2D
 from matplotlib.text import Text
 from matplotlib.ticker import Locator, Formatter
 from matplotlib.transforms import Transform, Bbox
 
 import datetime
 from typing import Any, Literal, Type, Iterable, Callable
-from matplotlib._typing import Color
 import numpy as np
 from numpy.typing import ArrayLike
 
diff --git a/lib/matplotlib/backend_bases.pyi b/lib/matplotlib/backend_bases.pyi
@@ -19,20 +19,14 @@ from matplotlib.axes import Axes
 from matplotlib.backend_managers import ToolManager
 from matplotlib.backend_tools import Cursors, ToolBase
 from matplotlib.colorbar import Colorbar
+from matplotlib.colors import Color
 from matplotlib.figure import Figure
 from matplotlib.font_manager import FontProperties
+from matplotlib.lines import LineStyleType
 from matplotlib.path import Path
 from matplotlib.texmanager import TexManager
 from matplotlib.text import Text
 from matplotlib.transforms import Affine2D, Transform, TransformedPath, Bbox
-from matplotlib._typing import (
-    Color,
-    LineStyleType,
-    FillStyleType,
-    DrawStyleType,
-    MarkerType,
-    MarkEveryType,
-)
 
 from typing import Any, Callable, Literal, NamedTuple, Sequence, Type, TypeVar
 from numpy.typing import ArrayLike
diff --git a/lib/matplotlib/collections.pyi b/lib/matplotlib/collections.pyi
@@ -1,20 +1,13 @@
 from . import artist, cbook, cm, transforms
 from .backend_bases import MouseEvent
 from .artist import Artist
-from .colors import Normalize, Colormap
+from .colors import Color, Normalize, Colormap
+from .lines import LineStyleType
 from .path import Path
 from .patches import Patch
 from .ticker import Locator, Formatter
 from .tri import Triangulation
 from ._enums import CapStyle, JoinStyle
-from ._typing import (
-    LineStyleType,
-    FillStyleType,
-    DrawStyleType,
-    MarkerType,
-    MarkEveryType,
-    Color,
-)
 
 import numpy as np
 from numpy.typing import ArrayLike
diff --git a/lib/matplotlib/colorbar.pyi b/lib/matplotlib/colorbar.pyi
@@ -4,8 +4,6 @@ from matplotlib.axes import Axes
 from matplotlib.patches import Patch
 from matplotlib.ticker import Locator, Formatter
 
-from matplotlib._typing import Color
-
 import numpy as np
 from numpy.typing import ArrayLike
 from typing import Any, Literal, Sequence, overload
@@ -80,7 +78,7 @@ class Colorbar:
     def add_lines(
         self,
         levels: ArrayLike,
-        colors: Color | Sequence[Color],
+        colors: colors.Color | Sequence[colors.Color],
         linewidths: float | ArrayLike,
         erase: bool = ...,
     ) -> None: ...
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -48,6 +48,8 @@
 import itertools
 from numbers import Real
 import re
+from typing import Union
+
 from PIL import Image
 from PIL.PngImagePlugin import PngInfo
 
@@ -56,6 +58,12 @@
 from matplotlib import _api, _cm, cbook, scale
 from ._color_data import BASE_COLORS, TABLEAU_COLORS, CSS4_COLORS, XKCD_COLORS
 
+Color = Union[
+    tuple[float, float, float],
+    tuple[float, float, float, float],
+    str,
+]
+
 
 class _ColorMapping(dict):
     def __init__(self, mapping):
diff --git a/lib/matplotlib/colors.pyi b/lib/matplotlib/colors.pyi
@@ -3,12 +3,13 @@ from collections.abc import Mapping
 from matplotlib import cbook, scale
 import re
 
-from ._typing import Color
-from typing import Any, Callable, Sequence, Iterable, Iterator, Literal, Type, overload
+from typing import Any, Callable, Sequence, Iterable, Iterator, Literal, Type, Union, overload
 
 import numpy as np
 from numpy.typing import ArrayLike
 
+Color = Union[tuple[float, float, float], tuple[float, float, float, float], str]
+
 class _ColorMapping(dict[str, Color]):
     cache: dict[tuple[Color, float | None], tuple[float, float, float, float]]
     def __init__(self, mapping) -> None: ...
diff --git a/lib/matplotlib/contour.pyi b/lib/matplotlib/contour.pyi
@@ -3,13 +3,12 @@ from matplotlib.artist import Artist
 from matplotlib.axes import Axes
 from matplotlib.backend_bases import MouseButton
 from matplotlib.collections import Collection, PathCollection
-from matplotlib.colors import Colormap, Normalize
+from matplotlib.colors import Color, Colormap, Normalize
 from matplotlib.font_manager import FontProperties
 from matplotlib.text import Text
 from matplotlib.transforms import Transform
 from matplotlib.ticker import Locator, Formatter
 
-from matplotlib._typing import Color
 from numpy.typing import ArrayLike
 import numpy as np
 from typing import Any, Callable, Literal, Iterable, Sequence
diff --git a/lib/matplotlib/figure.pyi b/lib/matplotlib/figure.pyi
@@ -12,7 +12,7 @@ from matplotlib.backend_bases import (
     NonGuiException,
     RendererBase,
 )
-from matplotlib.colors import Colormap, Normalize
+from matplotlib.colors import Color, Colormap, Normalize
 from matplotlib.colorbar import Colorbar
 from matplotlib.cm import ScalarMappable
 from matplotlib.gridspec import GridSpec, SubplotSpec
@@ -36,8 +36,6 @@ from matplotlib.transforms import (
     Transform,
 )
 
-from matplotlib._typing import Color
-
 import numpy as np
 from numpy.typing import ArrayLike
 
diff --git a/lib/matplotlib/legend.pyi b/lib/matplotlib/legend.pyi
@@ -11,6 +11,7 @@ from matplotlib.collections import (
     PolyCollection,
     RegularPolyCollection,
 )
+from matplotlib.colors import Color
 from matplotlib.container import BarContainer, ErrorbarContainer, StemContainer
 from matplotlib.figure import Figure
 from matplotlib.font_manager import FontProperties
@@ -35,7 +36,6 @@ from matplotlib.transforms import (
     Transform,
 )
 
-from matplotlib._typing import Color
 
 import pathlib
 from typing import Any, Literal, Iterable, Type, overload
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -6,6 +6,7 @@
 
 from numbers import Integral, Number, Real
 import logging
+from typing import Literal, Sequence, Union
 
 import numpy as np
 
@@ -1606,3 +1607,18 @@ def onpick(self, event):
 lineMarkers = MarkerStyle.markers
 drawStyles = Line2D.drawStyles
 fillStyles = MarkerStyle.fillstyles
+
+LineStyleType = Union[str, tuple[float, Sequence[float]]]
+DrawStyleType = Literal[
+    "default", "steps", "steps-pre", "steps-mid", "steps-post"
+]
+MarkEveryType = Union[
+    None,
+    int,
+    tuple[int, int],
+    slice,
+    list[int],
+    float,
+    tuple[float, float],
+    list[bool],
+]
diff --git a/lib/matplotlib/lines.pyi b/lib/matplotlib/lines.pyi
@@ -4,6 +4,7 @@ from .artist import Artist, allow_rasterization
 from .axes import Axes
 from .backend_bases import MouseEvent, FigureCanvasBase
 from .cbook import STEP_LOOKUP_MAP, ls_mapper, ls_mapper_r
+from .colors import Color
 from .markers import (
     CARETDOWN,
     CARETDOWNBASE,
@@ -18,17 +19,11 @@ from .markers import (
     TICKRIGHT,
     TICKUP,
     MarkerStyle,
+    MarkerType,
+    FillStyleType,
 )
 from .path import Path
 from .transforms import Bbox, BboxTransformTo, TransformedPath, Transform
-from ._typing import (
-    Color,
-    LineStyleType,
-    FillStyleType,
-    DrawStyleType,
-    MarkerType,
-    MarkEveryType,
-)
 
 from typing import Any, Literal, Sequence, Union, Callable, overload
 from numpy.typing import ArrayLike
@@ -158,4 +153,10 @@ class VertexSelector:
 lineStyles: dict[str, str]
 lineMarkers: dict[str | int, str]
 drawStyles: dict[str, str]
-fillStyles: tuple[str, ...]
+fillStyles: tuple[FillStyleType, ...]
+
+LineStyleType = Union[str, tuple[float, Sequence[float]]]
+DrawStyleType = Literal["default", "steps", "steps-pre", "steps-mid", "steps-post"]
+MarkEveryType = Union[
+    None, int, tuple[int, int], slice, list[int], float, tuple[float, float], list[bool]
+]
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -135,6 +135,7 @@
 import copy
 
 from collections.abc import Sized
+from typing import Union, Literal
 
 import numpy as np
 
@@ -921,3 +922,7 @@ def _set_x_filled(self):
             self._transform.rotate_deg(
                 {'top': 0, 'left': 90, 'bottom': 180, 'right': 270}[fs])
             self._alt_transform = self._transform.frozen().rotate_deg(180)
+
+
+MarkerType = Union[str, Path, MarkerStyle]
+FillStyleType = Literal["full", "left", "right", "bottom", "top", "none"]
diff --git a/lib/matplotlib/markers.pyi b/lib/matplotlib/markers.pyi
@@ -4,7 +4,7 @@ from .path import Path
 from .transforms import Affine2D, IdentityTransform, Transform
 
 from numpy.typing import ArrayLike
-from typing import Literal
+from typing import Literal, Union
 
 TICKLEFT: int
 TICKRIGHT: int
@@ -22,12 +22,11 @@ CARETDOWNBASE: int
 class MarkerStyle:
     markers: dict[str | int, str]
     filled_markers: tuple[str, ...]
-    fillstyles: tuple[str, ...]
+    fillstyles: tuple[FillStyleType, ...]
     def __init__(
         self,
         marker: str | ArrayLike | Path | MarkerStyle | None = ...,
-        fillstyle: Literal["full", "left", "right", "bottom", "top", "none"]
-        | None = ...,
+        fillstyle: FillStyleType | None = ...,
         transform: Transform | None = ...,
         capstyle: CapStyle | None = ...,
         joinstyle: JoinStyle | None = ...,
@@ -36,7 +35,7 @@ class MarkerStyle:
     def is_filled(self) -> bool: ...
     def get_fillstyle(
         self,
-    ) -> Literal["full", "left", "right", "bottom", "top", "none"]: ...
+    ) -> FillStyleType: ...
     def get_joinstyle(self) -> JoinStyle: ...
     def get_capstyle(self) -> CapStyle: ...
     def get_marker(self) -> str | ArrayLike | Path | MarkerStyle | None: ...
@@ -51,3 +50,6 @@ class MarkerStyle:
         self, *, deg: float | None = ..., rad: float | None = ...
     ) -> MarkerStyle: ...
     def scaled(self, sx: float, sy: float | None = ...) -> MarkerStyle: ...
+
+MarkerType = Union[str, Path, MarkerStyle]
+FillStyleType = Literal["full", "left", "right", "bottom", "top", "none"]
diff --git a/lib/matplotlib/mathtext.pyi b/lib/matplotlib/mathtext.pyi
@@ -3,7 +3,7 @@ import os
 from ._mathtext import RasterParse, VectorParse, get_unicode_index
 from matplotlib.font_manager import FontProperties
 from matplotlib.ft2font import FT2Image, LOAD_NO_HINTING
-from matplotlib._typing import Color
+from matplotlib.colors import Color
 
 from typing import Literal
 
diff --git a/lib/matplotlib/patches.pyi b/lib/matplotlib/patches.pyi
@@ -12,9 +12,10 @@ from .bezier import (
     split_bezier_intersecting_with_closedpath,
     split_path_inout,
 )
+from .colors import Color
+from .lines import LineStyleType
 from .path import Path
 from .transforms import Transform, Bbox
-from ._typing import Color, LineStyleType
 
 from typing import Any, Literal, Type, overload
 
diff --git a/lib/matplotlib/patheffects.pyi b/lib/matplotlib/patheffects.pyi
@@ -1,10 +1,10 @@
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase
+from matplotlib.colors import Color
 from matplotlib.path import Path
 from matplotlib.patches import Patch
 from matplotlib.transforms import Transform
 
 from typing import Iterable, Sequence
-from matplotlib._typing import Color
 
 class AbstractPathEffect:
     def __init__(self, offset: tuple[float, float] = ...) -> None: ...
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
diff --git a/lib/matplotlib/quiver.pyi b/lib/matplotlib/quiver.pyi
diff --git a/lib/matplotlib/rcsetup.pyi b/lib/matplotlib/rcsetup.pyi
diff --git a/lib/matplotlib/spines.pyi b/lib/matplotlib/spines.pyi
diff --git a/lib/matplotlib/stackplot.pyi b/lib/matplotlib/stackplot.pyi
diff --git a/lib/matplotlib/streamplot.pyi b/lib/matplotlib/streamplot.pyi
diff --git a/lib/matplotlib/table.pyi b/lib/matplotlib/table.pyi
diff --git a/lib/matplotlib/texmanager.pyi b/lib/matplotlib/texmanager.pyi
diff --git a/lib/matplotlib/text.pyi b/lib/matplotlib/text.pyi
diff --git a/lib/matplotlib/widgets.pyi b/lib/matplotlib/widgets.pyi

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from ._typing import Color`
	`1`	`+from .colors import Color`
`2`	`2`
`3`	`3`	`BASE_COLORS: dict[str, Color]`
`4`	`4`	`TABLEAU_COLORS: dict[str, Color]`