Update matplotlib typing definitions to remove RcGroupType and RcParamKeyType

nrnavaneet · nrnavaneet · commit 7dc5eaa358f8 · 2025-07-13T04:08:49.000+05:30
`Remove tools/update_rcparam_typing.py script`

`Update matplotlib rc function to accept string group instead of RcGroupType`

`Remove unused imports and docstrings`
diff --git a/lib/matplotlib/__init__.pyi b/lib/matplotlib/__init__.pyi
@@ -39,7 +39,7 @@ import contextlib
 from packaging.version import Version
 
 from matplotlib._api import MatplotlibDeprecationWarning
-from matplotlib.typing import LogLevel, RcGroupType, RcParamKeyType
+from matplotlib.typing import LogLevel
 from typing import Any, Literal, NamedTuple, overload
 
 
@@ -80,8 +80,6 @@ class RcParams(dict[str, Any]):
     def _ensure_has_backend(self) -> None: ...
     def __setitem__(self, key: str, val: Any) -> None: ...
     def __getitem__(self, key: str) -> Any: ...
-    def get_typed(self, key: RcParamKeyType) -> Any: ...
-    def set_typed(self, key: RcParamKeyType, val: Any) -> None: ...
     def __iter__(self) -> Generator[str, None, None]: ...
     def __len__(self) -> int: ...
     def find_all(self, pattern: str) -> RcParams: ...
@@ -99,7 +97,7 @@ rcParams: RcParams
 rcParamsOrig: RcParams
 defaultParams: dict[str, Any]
 
-def rc(group: RcGroupType, **kwargs) -> None: ...
+def rc(group: str, **kwargs) -> None: ...
 def rcdefaults() -> None: ...
 def rc_file_defaults() -> None: ...
 def rc_file(
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -50,7 +50,7 @@
 import sys
 import threading
 import time
-from typing import IO, TYPE_CHECKING, cast, overload
+from typing import TYPE_CHECKING, cast, overload
 
 from cycler import cycler  # noqa: F401
 import matplotlib
@@ -100,14 +100,7 @@
     import matplotlib.backend_bases
     from matplotlib.axis import Tick
     from matplotlib.axes._base import _AxesBase
-    from matplotlib.backend_bases import (
-        CloseEvent,
-        DrawEvent,
-        KeyEvent,
-        MouseEvent,
-        PickEvent,
-        ResizeEvent,
-    )
+    from matplotlib.backend_bases import Event
     from matplotlib.cm import ScalarMappable
     from matplotlib.contour import ContourSet, QuadContourSet
     from matplotlib.collections import (
@@ -133,18 +126,11 @@
     from matplotlib.quiver import Barbs, Quiver, QuiverKey
     from matplotlib.scale import ScaleBase
     from matplotlib.typing import (
-        CloseEventType,
         ColorType,
         CoordsType,
-        DrawEventType,
         HashableList,
-        KeyEventType,
         LineStyleType,
         MarkerType,
-        MouseEventType,
-        PickEventType,
-        ResizeEventType,
-        RcGroupType,
     )
     from matplotlib.widgets import SubplotTool
 
@@ -352,8 +338,8 @@ def uninstall_repl_displayhook() -> None:
 
 # Ensure this appears in the pyplot docs.
 @_copy_docstring_and_deprecators(matplotlib.set_loglevel)
-def set_loglevel(level: str) -> None:
-    return matplotlib.set_loglevel(level)
+def set_loglevel(*args, **kwargs) -> None:
+    return matplotlib.set_loglevel(*args, **kwargs)
 
 
 @_copy_docstring_and_deprecators(Artist.findobj)
@@ -787,9 +773,10 @@ def pause(interval: float) -> None:
 
 
 @_copy_docstring_and_deprecators(matplotlib.rc)
-def rc(group: RcGroupType, **kwargs) -> None:
+def rc(group: str, **kwargs) -> None:
     matplotlib.rc(group, **kwargs)
 
+
 @_copy_docstring_and_deprecators(matplotlib.rc_context)
 def rc_context(
     rc: dict[str, Any] | None = None,
@@ -1188,32 +1175,8 @@ def get_current_fig_manager() -> FigureManagerBase | None:
     return gcf().canvas.manager
 
 
-@overload
-def connect(s: MouseEventType, func: Callable[[MouseEvent], Any]) -> int: ...
-
-
-@overload
-def connect(s: KeyEventType, func: Callable[[KeyEvent], Any]) -> int: ...
-
-
-@overload
-def connect(s: PickEventType, func: Callable[[PickEvent], Any]) -> int: ...
-
-
-@overload
-def connect(s: ResizeEventType, func: Callable[[ResizeEvent], Any]) -> int: ...
-
-
-@overload
-def connect(s: CloseEventType, func: Callable[[CloseEvent], Any]) -> int: ...
-
-
-@overload
-def connect(s: DrawEventType, func: Callable[[DrawEvent], Any]) -> int: ...
-
-
 @_copy_docstring_and_deprecators(FigureCanvasBase.mpl_connect)
-def connect(s, func) -> int:
+def connect(s: str, func: Callable[[Event], Any]) -> int:
     return gcf().canvas.mpl_connect(s, func)
 
 
@@ -1296,11 +1259,11 @@ def draw() -> None:
 
 
 @_copy_docstring_and_deprecators(Figure.savefig)
-def savefig(fname: str | os.PathLike | IO, **kwargs) -> None:
+def savefig(*args, **kwargs) -> None:
     fig = gcf()
     # savefig default implementation has no return, so mypy is unhappy
     # presumably this is here because subclasses can return?
-    res = fig.savefig(fname, **kwargs)  # type: ignore[func-returns-value]
+    res = fig.savefig(*args, **kwargs)  # type: ignore[func-returns-value]
     fig.canvas.draw_idle()  # Need this if 'transparent=True', to reset colors.
     return res
 
diff --git a/lib/matplotlib/typing.py b/lib/matplotlib/typing.py
@@ -80,26 +80,6 @@
 LogLevel: TypeAlias = Literal["notset", "debug", "info", "warning", "error", "critical"]
 """Valid string values for logging levels used in `set_loglevel`."""
 
-RcGroupType: TypeAlias = Literal[
-    "animation", "axes", "axes3d", "backend", "boxplot", "contour", "date",
-    "errorbar", "figure", "font", "grid", "hatch", "image", "interactive",
-    "keymap", "legend", "lines", "markers", "patch", "path", "pdf", "pgf", "ps",
-    "savefig", "scatter", "text", "tk", "toolbar", "xtick", "ytick"
-]
-"""Valid values for the `group` parameter in `rc(group=...)`."""
-
-# --- START GENERATED RcParamKeyType ---
-RcParamKeyType: TypeAlias = Literal[
-    "_internal.classic_mode",
-
-]
-# --- END GENERATED RcParamKeyType ---
-"""The keys are extracted directly from the matplotlib runtime via:
- `generate_rc_keys_once.py`
-To regenerate this block:
-1. Run `python tools/update_rc_keys_once.py`
-2. Replace the content between the START and END markers below
-"""
 
 JoinStyleType: TypeAlias = JoinStyle | Literal["miter", "round", "bevel"]
 """Line join styles. See :doc:`/gallery/lines_bars_and_markers/joinstyle`."""
diff --git a/tools/update_rcparam_typing.py b/tools/update_rcparam_typing.py
