Import generics from standard modules in all third-party stubs (#7791)

Author: AlexWaygood

.flake8

@@ -18,9 +18,6 @@
 #       F405 defined from star imports
 
 # Rules that we'd like to enable in the future:
-#       Y027 Disallow importing typing.ContextManager, typing.OrderedDict &
-#            typing_extensions.OrderedDict (cannot be globally enabled while typeshed
-#            still contains stubs supporting Python 2).
 #       Y034 Detect common errors where certain methods are annotated as having a fixed
 #            return type, despite returning self at runtime (temporarily disabled for
 #            typing.pyi, enabled elsewhere).
@@ -36,7 +33,6 @@ per-file-ignores =
   # Unfortunately, flake8 does not allow to "noqa" just a specific error inside the file itself.
   # https://github.com/PyCQA/flake8/issues/1079
   #     F811 redefinition of unused '...'
-  stubs/*.pyi: E301, E302, E305, E501, E701, E741, F401, F403, F405, F822, Y027, Y037
   stdlib/typing.pyi: E301, E302, E305, E501, E701, E741, F401, F403, F405, F811, F822, Y034, Y037
 
 exclude = .venv*,.git,*_pb2.pyi,stdlib/@python2/*

stubs/Deprecated/deprecated/classic.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Callable, TypeVar, overload
+from collections.abc import Callable
+from typing import Any, TypeVar, overload
 from typing_extensions import Literal, TypeAlias
 
 _F = TypeVar("_F", bound=Callable[..., Any])

stubs/Deprecated/deprecated/sphinx.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Callable, TypeVar
+from collections.abc import Callable
+from typing import Any, TypeVar
 from typing_extensions import Literal
 
 from .classic import ClassicAdapter, _Actions

stubs/Flask-Cors/flask_cors/decorator.pyi

@@ -1,7 +1,7 @@
-from collections.abc import Callable
+from collections.abc import Callable, Iterable
 from datetime import timedelta
 from logging import Logger
-from typing import Any, Iterable, Pattern
+from typing import Any, Pattern
 from typing_extensions import ParamSpec
 
 _P = ParamSpec("_P")

stubs/SQLAlchemy/sqlalchemy/orm/query.pyi

@@ -1,5 +1,6 @@
 from _typeshed import Self
-from typing import Any, Generic, Iterator, TypeVar
+from collections.abc import Iterator
+from typing import Any, Generic, TypeVar
 
 from ..sql.annotation import SupportsCloneAnnotations
 from ..sql.base import Executable

stubs/atomicwrites/atomicwrites/__init__.pyi

@@ -1,17 +1,20 @@
 from _typeshed import StrOrBytesPath
 from collections.abc import Callable
-from typing import IO, Any, AnyStr, ContextManager
+from contextlib import AbstractContextManager
+from typing import IO, Any, AnyStr
 
 def replace_atomic(src: AnyStr, dst: AnyStr) -> None: ...
 def move_atomic(src: AnyStr, dst: AnyStr) -> None: ...
 
 class AtomicWriter:
     def __init__(self, path: StrOrBytesPath, mode: str = ..., overwrite: bool = ...) -> None: ...
-    def open(self) -> ContextManager[IO[Any]]: ...
-    def _open(self, get_fileobject: Callable[..., IO[AnyStr]]) -> ContextManager[IO[AnyStr]]: ...
+    def open(self) -> AbstractContextManager[IO[Any]]: ...
+    def _open(self, get_fileobject: Callable[..., IO[AnyStr]]) -> AbstractContextManager[IO[AnyStr]]: ...
     def get_fileobject(self, dir: StrOrBytesPath | None = ..., **kwargs: Any) -> IO[Any]: ...
     def sync(self, f: IO[Any]) -> None: ...
     def commit(self, f: IO[Any]) -> None: ...
     def rollback(self, f: IO[Any]) -> None: ...
 
-def atomic_write(path: StrOrBytesPath, writer_cls: type[AtomicWriter] = ..., **cls_kwargs: object) -> ContextManager[IO[Any]]: ...
+def atomic_write(
+    path: StrOrBytesPath, writer_cls: type[AtomicWriter] = ..., **cls_kwargs: object
+) -> AbstractContextManager[IO[Any]]: ...

stubs/characteristic/characteristic/__init__.pyi

@@ -1,4 +1,5 @@
-from typing import Any, AnyStr, Callable, Sequence, TypeVar
+from collections.abc import Callable, Sequence
+from typing import Any, AnyStr, TypeVar
 
 def with_repr(attrs: Sequence[AnyStr | Attribute]) -> Callable[..., Any]: ...
 def with_cmp(attrs: Sequence[AnyStr | Attribute]) -> Callable[..., Any]: ...

stubs/colorama/colorama/ansitowin32.pyi

@@ -1,7 +1,8 @@
 import sys
 from _typeshed import SupportsWrite
+from collections.abc import Callable, Sequence
 from types import TracebackType
-from typing import Any, Callable, Pattern, Sequence, TextIO
+from typing import Any, Pattern, TextIO
 from typing_extensions import TypeAlias
 
 if sys.platform == "win32":

stubs/colorama/colorama/initialise.pyi

@@ -1,4 +1,5 @@
-from typing import Any, ContextManager, TextIO
+from contextlib import AbstractContextManager
+from typing import Any, TextIO
 
 from .ansitowin32 import StreamWrapper
 
@@ -11,7 +12,7 @@ atexit_done: bool
 def reset_all() -> None: ...
 def init(autoreset: bool = ..., convert: bool | None = ..., strip: bool | None = ..., wrap: bool = ...) -> None: ...
 def deinit() -> None: ...
-def colorama_text(*args: Any, **kwargs: Any) -> ContextManager[None]: ...
+def colorama_text(*args: Any, **kwargs: Any) -> AbstractContextManager[None]: ...
 def reinit() -> None: ...
 def wrap_stream(
     stream: TextIO, convert: bool | None, strip: bool | None, autoreset: bool, wrap: bool

stubs/colorama/colorama/win32.pyi

@@ -1,5 +1,5 @@
 import sys
-from typing import Callable
+from collections.abc import Callable
 from typing_extensions import Literal
 
 STDOUT: Literal[-11]