Merge pull request matplotlib#30312 from dstansby/deprecated-imports

Replace deprecated imports

Author: tacaswell

lib/matplotlib/_api/__init__.pyi

@@ -1,6 +1,6 @@
 from collections.abc import Callable, Generator, Iterable, Mapping, Sequence
 from typing import Any, TypeVar, overload
-from typing_extensions import Self  # < Py 3.11
+from typing import Self
 
 from numpy.typing import NDArray
 

lib/matplotlib/axis.pyi

@@ -1,7 +1,7 @@
 from collections.abc import Callable, Iterable, Sequence
 import datetime
 from typing import Any, Literal, overload
-from typing_extensions import Self  # < Py 3.11
+from typing import Self
 
 import numpy as np
 from numpy.typing import ArrayLike

lib/matplotlib/cbook.pyi

@@ -14,10 +14,10 @@ from typing import (
     Generic,
     IO,
     Literal,
-    Sequence,
     TypeVar,
     overload,
 )
+from collections.abc import Sequence
 
 _T = TypeVar("_T")
 

lib/matplotlib/dviread.pyi

@@ -6,7 +6,7 @@ from enum import Enum
 from collections.abc import Generator
 
 from typing import NamedTuple
-from typing_extensions import Self  # < Py 3.11
+from typing import Self
 
 class _dvistate(Enum):
     pre = ...

lib/matplotlib/sankey.pyi

@@ -2,7 +2,7 @@ from matplotlib.axes import Axes
 
 from collections.abc import Callable, Iterable
 from typing import Any
-from typing_extensions import Self  # < Py 3.11
+from typing import Self
 
 import numpy as np
 

lib/matplotlib/tests/test_api.py

@@ -13,7 +13,7 @@
 
 
 if typing.TYPE_CHECKING:
-    from typing_extensions import Self
+    from typing import Self
 
 T = TypeVar('T')
 

lib/matplotlib/typing.py

@@ -12,7 +12,8 @@
 """
 from collections.abc import Hashable, Sequence
 import pathlib
-from typing import Any, Callable, Literal, TypeAlias, TypeVar, Union
+from typing import Any, Literal, TypeAlias, TypeVar, Union
+from collections.abc import Callable
 
 from . import path
 from ._enums import JoinStyle, CapStyle

pyproject.toml

@@ -140,6 +140,7 @@ select = [
     "E",
     "F",
     "W",
+    "UP035",
     # The following error codes require the preview mode to be enabled.
     "E201",
     "E202",