Update for expired 3.5 deprecations

ksunden · ksunden · commit bd9d30785c31 · 2023-03-30T12:31:22.000-05:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1,34 +1,3 @@
-__all__ = [
-    "__bibtex__",
-    "__version_info__",
-    "set_loglevel",
-    "ExecutableNotFoundError",
-    "get_configdir",
-    "get_cachedir",
-    "get_data_path",
-    "matplotlib_fname",
-    "RcParams",
-    "rc_params",
-    "rc_params_from_file",
-    "rcParamsDefault",
-    "rcParams",
-    "rcParamsOrig",
-    "defaultParams",
-    "rc",
-    "rcdefaults",
-    "rc_file_defaults",
-    "rc_file",
-    "rc_context",
-    "use",
-    "get_backend",
-    "interactive",
-    "is_interactive",
-    "default_test_modules",
-    "colormaps",
-    "color_sequences",
-]
-
-
 """
 An object-oriented plotting library.
 
@@ -132,6 +101,36 @@
 
 """
 
+__all__ = [
+    "__bibtex__",
+    "__version_info__",
+    "set_loglevel",
+    "ExecutableNotFoundError",
+    "get_configdir",
+    "get_cachedir",
+    "get_data_path",
+    "matplotlib_fname",
+    "RcParams",
+    "rc_params",
+    "rc_params_from_file",
+    "rcParamsDefault",
+    "rcParams",
+    "rcParamsOrig",
+    "defaultParams",
+    "rc",
+    "rcdefaults",
+    "rc_file_defaults",
+    "rc_file",
+    "rc_context",
+    "use",
+    "get_backend",
+    "interactive",
+    "is_interactive",
+    "colormaps",
+    "color_sequences",
+]
+
+
 import atexit
 from collections import namedtuple
 from collections.abc import MutableMapping
diff --git a/lib/matplotlib/__init__.pyi b/lib/matplotlib/__init__.pyi
@@ -23,7 +23,6 @@ __all__ = [
     "get_backend",
     "interactive",
     "is_interactive",
-    "default_test_modules",
     "colormaps",
     "color_sequences",
 ]
@@ -105,8 +104,6 @@ def get_backend() -> str: ...
 def interactive(b: bool) -> None: ...
 def is_interactive() -> bool: ...
 
-default_test_modules: list[str]
-
 def _preprocess_data(
     func: Callable | None = ...,
     *,
diff --git a/lib/matplotlib/axes/_base.pyi b/lib/matplotlib/axes/_base.pyi
@@ -123,12 +123,12 @@ class _AxesBase(martist.Artist):
     def clear(self) -> None: ...
     def cla(self) -> None: ...
 
-    class ArtistList(MutableSequence[Artist]):
+    # Could be made generic, but comments indicate it may be temporary anyway
+    class ArtistList(Sequence[Artist]):
         def __init__(
             self,
             axes: _AxesBase,
             prop_name: str,
-            add_name: str,
             valid_types: list[Type] | None = ...,
             invalid_types: tuple[Type] | None = ...,
         ) -> None: ...
@@ -138,14 +138,20 @@ class _AxesBase(martist.Artist):
         def __getitem__(self, key: int) -> Artist: ...
         @overload
         def __getitem__(self, key: slice) -> list[Artist]: ...
+
+        @overload
         def __add__(self, other: _AxesBase.ArtistList) -> list[Artist]: ...
+        @overload
+        def __add__(self, other: list[Any]) -> list[Any]: ...
+        @overload
+        def __add__(self, other: tuple[Any]) -> tuple[Any]: ...
+
+        @overload
         def __radd__(self, other: _AxesBase.ArtistList) -> list[Artist]: ...
-        def insert(self, index: int, item: Artist) -> None: ...
         @overload
-        def __setitem__(self, key: int | slice, item: Artist) -> None: ...
+        def __radd__(self, other: list[Any]) -> list[Any]: ...
         @overload
-        def __setitem__(self, key: slice, item: Iterable[Artist]) -> None: ...
-        def __delitem__(self, key: int | slice) -> None: ...
+        def __radd__(self, other: tuple[Any]) -> tuple[Any]: ...
 
     @property
     def artists(self) -> _AxesBase.ArtistList: ...
diff --git a/lib/matplotlib/colorbar.pyi b/lib/matplotlib/colorbar.pyi
@@ -86,17 +86,15 @@ class Colorbar:
     def set_ticks(
         self,
         ticks: Sequence[float] | Locator,
-        update_ticks: bool = ...,
-        labels: Sequence[str] | None = ...,
         *,
+        labels: Sequence[str] | None = ...,
         minor: bool = ...,
         **kwargs
     ) -> None: ...
     def get_ticks(self, minor: bool = ...) -> np.ndarray: ...
     def set_ticklabels(
         self,
         ticklabels: Sequence[str],
-        update_ticks: bool = ...,
         *,
         minor: bool = ...,
         **kwargs
