Make Color a union type of 3/4-tuple of floats and str

ksunden · ksunden · commit aee7c2ec4d99 · 2023-03-30T12:31:22.000-05:00
diff --git a/lib/matplotlib/_color_data.pyi b/lib/matplotlib/_color_data.pyi
@@ -0,0 +1,6 @@
+from ._typing import Color
+
+BASE_COLORS: dict[str, Color]
+TABLEAU_COLORS: dict[str, Color]
+XKCD_COLORS: dict[str, Color]
+CSS4_COLORS: dict[str, Color]
diff --git a/lib/matplotlib/axis.pyi b/lib/matplotlib/axis.pyi
@@ -9,11 +9,10 @@ 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
 
-# TODO actually type colors
-Color = Any
 
 GRIDLINE_INTERPOLATION_STEPS: int
 
diff --git a/lib/matplotlib/figure.pyi b/lib/matplotlib/figure.pyi
@@ -235,7 +235,6 @@ class FigureBase(Artist):
     ) -> Bbox: ...
 
     # Any in list of list is recursive list[list[Hashable | list[Hashable | ...]]] but that can't really be type checked
-    # TODO: add per_subplot_kw
     def subplot_mosaic(
         self,
         mosaic: str | list[list[Any]],
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -751,7 +751,7 @@ def figure(
     # defaults to rc figure.facecolor
     facecolor: Color | None = None,
     # defaults to rc figure.edgecolor
-    edgecolor: Color = None,
+    edgecolor: Color | None = None,
     frameon: bool = True,
     FigureClass: Type[Figure] = Figure,
     clear: bool = False,
diff --git a/lib/matplotlib/spines.pyi b/lib/matplotlib/spines.pyi
@@ -60,7 +60,7 @@ class Spine(mpatches.Patch):
     def circular_spine(
         cls: Type[T], axes: Axes, center: tuple[float, float], radius: float, **kwargs
     ) -> T: ...
-    def set_color(self, c: Color) -> None: ...
+    def set_color(self, c: Color | None) -> None: ...
 
 class SpinesProxy:
     def __init__(self, spine_dict: dict[str, Spine]) -> None: ...
