Import from collections.abc wherever possible

stdlib/_bisect.pyi

@@ -1,6 +1,7 @@
 import sys
 from _typeshed import SupportsRichComparisonT
-from typing import Callable, MutableSequence, Sequence, TypeVar, overload
+from collections.abc import Callable, MutableSequence, Sequence
+from typing import TypeVar, overload
 
 _T = TypeVar("_T")
 

stdlib/_codecs.pyi

@@ -1,6 +1,7 @@
 import codecs
 import sys
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 from typing_extensions import TypeAlias
 
 # This type is not exposed; it is defined in unicodeobject.c

stdlib/_compression.pyi

@@ -1,6 +1,7 @@
 from _typeshed import WriteableBuffer
+from collections.abc import Callable
 from io import DEFAULT_BUFFER_SIZE, BufferedIOBase, RawIOBase
-from typing import Any, Callable, Protocol
+from typing import Any, Protocol
 
 BUFFER_SIZE = DEFAULT_BUFFER_SIZE
 

stdlib/_csv.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Iterable, Iterator, Protocol, Union
+from collections.abc import Iterable, Iterator
+from typing import Any, Protocol, Union
 from typing_extensions import Literal, TypeAlias
 
 __version__: str

stdlib/_decimal.pyi

@@ -1,8 +1,9 @@
 import numbers
 import sys
 from _typeshed import Self
+from collections.abc import Container, Sequence
 from types import TracebackType
-from typing import Any, Container, NamedTuple, Sequence, Union, overload
+from typing import Any, NamedTuple, Union, overload
 from typing_extensions import TypeAlias
 
 _Decimal: TypeAlias = Decimal | int

stdlib/_dummy_thread.pyi

@@ -1,5 +1,6 @@
+from collections.abc import Callable
 from types import TracebackType
-from typing import Any, Callable, NoReturn
+from typing import Any, NoReturn
 
 TIMEOUT_MAX: int
 error = RuntimeError

stdlib/_dummy_threading.pyi

@@ -1,6 +1,7 @@
 import sys
+from collections.abc import Callable, Iterable, Mapping
 from types import FrameType, TracebackType
-from typing import Any, Callable, Iterable, Mapping, TypeVar
+from typing import Any, TypeVar
 from typing_extensions import TypeAlias
 
 # TODO recursive type

stdlib/_json.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 from typing_extensions import final
 
 @final

stdlib/_operator.pyi

@@ -1,20 +1,6 @@
 import sys
-from typing import (
-    Any,
-    AnyStr,
-    Callable,
-    Container,
-    Generic,
-    Iterable,
-    Mapping,
-    MutableMapping,
-    MutableSequence,
-    Protocol,
-    Sequence,
-    SupportsAbs,
-    TypeVar,
-    overload,
-)
+from collections.abc import Callable, Container, Iterable, Mapping, MutableMapping, MutableSequence, Sequence
+from typing import Any, AnyStr, Generic, Protocol, SupportsAbs, TypeVar, overload
 from typing_extensions import ParamSpec, SupportsIndex, TypeAlias, final
 
 _R = TypeVar("_R")

stdlib/_osx_support.pyi

@@ -1,5 +1,6 @@
 import sys
-from typing import Iterable, Sequence, TypeVar
+from collections.abc import Iterable, Sequence
+from typing import TypeVar
 
 _T = TypeVar("_T")
 _K = TypeVar("_K")

stdlib/_posixsubprocess.pyi

@@ -1,5 +1,5 @@
 import sys
-from typing import Callable, Sequence
+from collections.abc import Callable, Sequence
 
 if sys.platform != "win32":
     def cloexec_pipe() -> tuple[int, int]: ...

stdlib/_sitebuiltins.pyi

@@ -1,4 +1,5 @@
-from typing import ClassVar, Iterable, NoReturn
+from collections.abc import Iterable
+from typing import ClassVar, NoReturn
 from typing_extensions import Literal
 
 class Quitter:

stdlib/_thread.pyi

@@ -1,8 +1,9 @@
 import sys
 from _typeshed import structseq
+from collections.abc import Callable
 from threading import Thread
 from types import TracebackType
-from typing import Any, Callable, NoReturn
+from typing import Any, NoReturn
 from typing_extensions import Final, final
 
 error = RuntimeError

stdlib/_tracemalloc.pyi

@@ -1,6 +1,6 @@
 import sys
+from collections.abc import Sequence
 from tracemalloc import _FrameTupleT, _TraceTupleT
-from typing import Sequence
 
 def _get_object_traceback(__obj: object) -> Sequence[_FrameTupleT] | None: ...
 def _get_traces() -> Sequence[_TraceTupleT]: ...

stdlib/_typeshed/__init__.pyi

@@ -6,9 +6,10 @@ import array
 import ctypes
 import mmap
 import sys
+from collections.abc import Awaitable, Container, Iterable, Set as AbstractSet
 from os import PathLike
 from types import TracebackType
-from typing import AbstractSet, Any, Awaitable, Container, Generic, Iterable, Protocol, TypeVar, Union
+from typing import Any, Generic, Protocol, TypeVar, Union
 from typing_extensions import Final, Literal, TypeAlias, final
 
 _KT = TypeVar("_KT")

stdlib/_typeshed/wsgi.pyi

@@ -6,7 +6,8 @@
 
 import sys
 from _typeshed import OptExcInfo
-from typing import Any, Callable, Iterable, Protocol
+from collections.abc import Callable, Iterable
+from typing import Any, Protocol
 from typing_extensions import TypeAlias
 
 class _Readable(Protocol):

stdlib/_weakref.pyi

@@ -1,5 +1,6 @@
 import sys
-from typing import Any, Callable, Generic, TypeVar, overload
+from collections.abc import Callable
+from typing import Any, Generic, TypeVar, overload
 from typing_extensions import final
 
 if sys.version_info >= (3, 9):

stdlib/_weakrefset.pyi

@@ -1,6 +1,7 @@
 import sys
 from _typeshed import Self
-from typing import Any, Generic, Iterable, Iterator, MutableSet, TypeVar
+from collections.abc import Iterable, Iterator, MutableSet
+from typing import Any, Generic, TypeVar
 
 if sys.version_info >= (3, 9):
     from types import GenericAlias

stdlib/_winapi.pyi

@@ -1,5 +1,6 @@
 import sys
-from typing import Any, NoReturn, Sequence, overload
+from collections.abc import Sequence
+from typing import Any, NoReturn, overload
 from typing_extensions import Literal, final
 
 if sys.platform == "win32":

stdlib/argparse.pyi

@@ -1,19 +1,6 @@
 import sys
-from typing import (
-    IO,
-    Any,
-    Callable,
-    Generator,
-    Generic,
-    Iterable,
-    NewType,
-    NoReturn,
-    Pattern,
-    Protocol,
-    Sequence,
-    TypeVar,
-    overload,
-)
+from collections.abc import Callable, Generator, Iterable, Sequence
+from typing import IO, Any, Generic, NewType, NoReturn, Pattern, Protocol, TypeVar, overload
 from typing_extensions import Literal
 
 if sys.version_info >= (3, 9):

stdlib/array.pyi

@@ -1,6 +1,7 @@
 import sys
 from _typeshed import Self
-from typing import Any, BinaryIO, Generic, Iterable, MutableSequence, TypeVar, overload
+from collections.abc import Iterable
+from typing import Any, BinaryIO, Generic, MutableSequence, TypeVar, overload
 from typing_extensions import Literal, SupportsIndex, TypeAlias
 
 _IntTypeCode: TypeAlias = Literal["b", "B", "h", "H", "i", "I", "l", "L", "q", "Q"]

stdlib/ast.pyi

@@ -1,6 +1,7 @@
 import sys
 from _ast import *
-from typing import Any, Iterator, TypeVar, overload
+from collections.abc import Iterator
+from typing import Any, TypeVar, overload
 from typing_extensions import Literal
 
 if sys.version_info >= (3, 8):

stdlib/asyncio/base_events.pyi

@@ -6,9 +6,9 @@ from asyncio.futures import Future
 from asyncio.protocols import BaseProtocol
 from asyncio.tasks import Task
 from asyncio.transports import BaseTransport, ReadTransport, SubprocessTransport, WriteTransport
-from collections.abc import Iterable
+from collections.abc import Awaitable, Callable, Coroutine, Generator, Iterable, Sequence
 from socket import AddressFamily, SocketKind, _Address, _RetAddress, socket
-from typing import IO, Any, Awaitable, Callable, Coroutine, Generator, Sequence, TypeVar, overload
+from typing import IO, Any, TypeVar, overload
 from typing_extensions import Literal, TypeAlias
 
 if sys.version_info >= (3, 7):

stdlib/asyncio/base_futures.pyi

@@ -1,5 +1,6 @@
 import sys
-from typing import Any, Callable, Sequence
+from collections.abc import Callable, Sequence
+from typing import Any
 from typing_extensions import Literal
 
 if sys.version_info >= (3, 7):

stdlib/asyncio/base_subprocess.pyi

@@ -1,6 +1,7 @@
 import subprocess
 from collections import deque
-from typing import IO, Any, Callable, Sequence
+from collections.abc import Callable, Sequence
+from typing import IO, Any
 from typing_extensions import TypeAlias
 
 from . import events, futures, protocols, transports

stdlib/asyncio/events.pyi

@@ -2,8 +2,9 @@ import ssl
 import sys
 from _typeshed import FileDescriptorLike, Self
 from abc import ABCMeta, abstractmethod
+from collections.abc import Awaitable, Callable, Coroutine, Generator, Sequence
 from socket import AddressFamily, SocketKind, _Address, _RetAddress, socket
-from typing import IO, Any, Awaitable, Callable, Coroutine, Generator, Sequence, TypeVar, overload
+from typing import IO, Any, TypeVar, overload
 from typing_extensions import Literal, TypeAlias
 
 from .base_events import Server

stdlib/asyncio/format_helpers.pyi

@@ -1,7 +1,8 @@
 import functools
 import traceback
+from collections.abc import Iterable
 from types import FrameType, FunctionType
-from typing import Any, Iterable, overload
+from typing import Any, overload
 from typing_extensions import TypeAlias
 
 class _HasWrapper:

stdlib/asyncio/futures.pyi

@@ -1,7 +1,8 @@
 import sys
 from _typeshed import Self
+from collections.abc import Awaitable, Callable, Generator, Iterable
 from concurrent.futures._base import Error, Future as _ConcurrentFuture
-from typing import Any, Awaitable, Callable, Generator, Iterable, TypeVar
+from typing import Any, TypeVar
 from typing_extensions import Literal, TypeGuard
 
 from .events import AbstractEventLoop

stdlib/asyncio/locks.pyi

@@ -1,7 +1,8 @@
 import sys
 from collections import deque
+from collections.abc import Callable, Generator
 from types import TracebackType
-from typing import Any, Callable, Generator, TypeVar
+from typing import Any, TypeVar
 from typing_extensions import Literal
 
 from .events import AbstractEventLoop

stdlib/asyncio/proactor_events.pyi

@@ -1,6 +1,7 @@
 import sys
+from collections.abc import Mapping
 from socket import socket
-from typing import Any, Mapping, Protocol
+from typing import Any, Protocol
 from typing_extensions import Literal
 
 from . import base_events, constants, events, futures, streams, transports

stdlib/asyncio/runners.pyi

@@ -1,5 +1,6 @@
 import sys
-from typing import Awaitable, TypeVar
+from collections.abc import Awaitable
+from typing import TypeVar
 
 __all__ = ("run",)
 _T = TypeVar("_T")

stdlib/asyncio/sslproto.pyi

@@ -1,7 +1,8 @@
 import ssl
 import sys
 from collections import deque
-from typing import Any, Callable, ClassVar
+from collections.abc import Callable
+from typing import Any, ClassVar
 from typing_extensions import Literal
 
 from . import constants, events, futures, protocols, transports

stdlib/asyncio/staggered.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Awaitable, Callable, Iterable
+from collections.abc import Awaitable, Callable, Iterable
+from typing import Any
 
 from . import events
 

stdlib/asyncio/streams.pyi

@@ -1,6 +1,7 @@
 import sys
 from _typeshed import Self, StrPath
-from typing import Any, AsyncIterator, Awaitable, Callable, Iterable, Sequence
+from collections.abc import AsyncIterator, Awaitable, Callable, Iterable, Sequence
+from typing import Any
 from typing_extensions import TypeAlias
 
 from . import events, protocols, transports

stdlib/asyncio/subprocess.pyi

@@ -2,7 +2,8 @@ import subprocess
 import sys
 from _typeshed import StrOrBytesPath
 from asyncio import events, protocols, streams, transports
-from typing import IO, Any, Callable
+from collections.abc import Callable
+from typing import IO, Any
 from typing_extensions import Literal, TypeAlias
 
 if sys.version_info >= (3, 7):

stdlib/asyncio/taskgroups.pyi

@@ -1,8 +1,9 @@
 # This only exists in 3.11+. See VERSIONS.
 
 from _typeshed import Self
+from collections.abc import Coroutine, Generator
 from types import TracebackType
-from typing import Any, Coroutine, Generator, TypeVar
+from typing import Any, TypeVar
 
 from .tasks import Task
 

stdlib/asyncio/tasks.pyi

@@ -1,8 +1,8 @@
 import concurrent.futures
 import sys
-from collections.abc import Awaitable, Generator, Iterable, Iterator
+from collections.abc import Awaitable, Coroutine, Generator, Iterable, Iterator
 from types import FrameType
-from typing import Any, Coroutine, Generic, TextIO, TypeVar, overload
+from typing import Any, Generic, TextIO, TypeVar, overload
 from typing_extensions import Literal, TypeAlias
 
 from .events import AbstractEventLoop

stdlib/asyncio/threads.pyi

@@ -1,4 +1,5 @@
-from typing import Callable, TypeVar
+from collections.abc import Callable
+from typing import TypeVar
 from typing_extensions import ParamSpec
 
 __all__ = ("to_thread",)

stdlib/asyncio/transports.pyi

@@ -1,8 +1,9 @@
 import sys
 from asyncio.events import AbstractEventLoop
 from asyncio.protocols import BaseProtocol
+from collections.abc import Mapping
 from socket import _Address
-from typing import Any, Mapping
+from typing import Any
 
 if sys.version_info >= (3, 7):
     __all__ = ("BaseTransport", "ReadTransport", "WriteTransport", "Transport", "DatagramTransport", "SubprocessTransport")

stdlib/asyncio/trsock.pyi

@@ -1,8 +1,9 @@
 import socket
 import sys
 from builtins import type as Type  # alias to avoid name clashes with property named "type"
+from collections.abc import Iterable
 from types import TracebackType
-from typing import Any, BinaryIO, Iterable, NoReturn, overload
+from typing import Any, BinaryIO, NoReturn, overload
 from typing_extensions import TypeAlias
 
 # These are based in socket, maybe move them out into _typeshed.pyi or such