Move StyleType to typing.RcStyleType

ksunden · ksunden · commit ec6a139caa36 · 2023-02-28T16:51:12.000-06:00
diff --git a/lib/matplotlib/style/core.pyi b/lib/matplotlib/style/core.pyi
@@ -1,19 +1,16 @@
 from collections.abc import Generator
-from typing import Any, TypeAlias
-from pathlib import Path
 import contextlib
 
 from matplotlib import RcParams
-
-StyleType: TypeAlias = str | dict[str, Any] | Path | list[str | Path | dict[str, Any]]
+from matplotlib.typing import RcStyleType
 
 USER_LIBRARY_PATHS: list[str] = ...
 STYLE_EXTENSION: str = ...
 
-def use(style: StyleType) -> None: ...
+def use(style: RcStyleType) -> None: ...
 @contextlib.contextmanager
 def context(
-    style: StyleType, after_reset: bool = ...
+    style: RcStyleType, after_reset: bool = ...
 ) -> Generator[None, None, None]: ...
 
 class _StyleLibrary(dict[str, RcParams]): ...
diff --git a/lib/matplotlib/typing.py b/lib/matplotlib/typing.py
@@ -10,9 +10,10 @@
     a deprecation period.
 """
 from collections.abc import Sequence
-from typing import Literal, Union
+import pathlib
+from typing import Any, Literal, Union
 
-from .path import Path
+from . import path
 from .markers import MarkerStyle
 
 # The following are type aliases. Once python 3.9 is dropped, they should be annotated
@@ -34,5 +35,9 @@
     list[bool]
 ]
 
-MarkerType = Union[str, Path, MarkerStyle]
+MarkerType = Union[str, path.Path, MarkerStyle]
 FillStyleType = Literal["full", "left", "right", "bottom", "top", "none"]
+
+RcStyleType = Union[
+    str, dict[str, Any], pathlib.Path, list[Union[str, pathlib.Path, dict[str, Any]]]
+]
