diff --git a/stdlib/_bisect.pyi b/stdlib/_bisect.pyi index 5608094ccbd6..d902e1eea7d4 100644 --- a/stdlib/_bisect.pyi +++ b/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") diff --git a/stdlib/_codecs.pyi b/stdlib/_codecs.pyi index e0fe26cf1f76..e335f6d5119a 100644 --- a/stdlib/_codecs.pyi +++ b/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 diff --git a/stdlib/_compression.pyi b/stdlib/_compression.pyi index e71f7d14bd2b..ec3c7fe70856 100644 --- a/stdlib/_compression.pyi +++ b/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 diff --git a/stdlib/_csv.pyi b/stdlib/_csv.pyi index c895710314aa..ae9031df6e81 100644 --- a/stdlib/_csv.pyi +++ b/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 diff --git a/stdlib/_decimal.pyi b/stdlib/_decimal.pyi index a0a9700dba4c..fdeca8f7c42f 100644 --- a/stdlib/_decimal.pyi +++ b/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 diff --git a/stdlib/_dummy_thread.pyi b/stdlib/_dummy_thread.pyi index 97ba17ae497d..f257b758eeab 100644 --- a/stdlib/_dummy_thread.pyi +++ b/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 diff --git a/stdlib/_dummy_threading.pyi b/stdlib/_dummy_threading.pyi index 3810f9fe7a32..2daceaedd4ad 100644 --- a/stdlib/_dummy_threading.pyi +++ b/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 diff --git a/stdlib/_json.pyi b/stdlib/_json.pyi index 962fa9ec257a..130f7ab92e97 100644 --- a/stdlib/_json.pyi +++ b/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 diff --git a/stdlib/_operator.pyi b/stdlib/_operator.pyi index 57f69b598ffc..92e04d0f499d 100644 --- a/stdlib/_operator.pyi +++ b/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") diff --git a/stdlib/_osx_support.pyi b/stdlib/_osx_support.pyi index cb43fa93bb80..7fd0ee922ca6 100644 --- a/stdlib/_osx_support.pyi +++ b/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") diff --git a/stdlib/_posixsubprocess.pyi b/stdlib/_posixsubprocess.pyi index 5481100cacfc..2d221c4896f6 100644 --- a/stdlib/_posixsubprocess.pyi +++ b/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]: ... diff --git a/stdlib/_sitebuiltins.pyi b/stdlib/_sitebuiltins.pyi index a71364b8db65..4a35921e1ef7 100644 --- a/stdlib/_sitebuiltins.pyi +++ b/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: diff --git a/stdlib/_thread.pyi b/stdlib/_thread.pyi index 04abf8dc869c..c5da8ccf3a90 100644 --- a/stdlib/_thread.pyi +++ b/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 diff --git a/stdlib/_tracemalloc.pyi b/stdlib/_tracemalloc.pyi index fd159dc586cb..6e3c4e59a07a 100644 --- a/stdlib/_tracemalloc.pyi +++ b/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]: ... diff --git a/stdlib/_typeshed/__init__.pyi b/stdlib/_typeshed/__init__.pyi index 0ccb3f8bf434..a80ea0702f77 100644 --- a/stdlib/_typeshed/__init__.pyi +++ b/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") diff --git a/stdlib/_typeshed/wsgi.pyi b/stdlib/_typeshed/wsgi.pyi index aafabf6ade0b..81ca12910bd9 100644 --- a/stdlib/_typeshed/wsgi.pyi +++ b/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): diff --git a/stdlib/_weakref.pyi b/stdlib/_weakref.pyi index 0a84f69265c0..2d3faec1fa68 100644 --- a/stdlib/_weakref.pyi +++ b/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): diff --git a/stdlib/_weakrefset.pyi b/stdlib/_weakrefset.pyi index b0c22a5ecc13..382dbdeb6c8a 100644 --- a/stdlib/_weakrefset.pyi +++ b/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 diff --git a/stdlib/_winapi.pyi b/stdlib/_winapi.pyi index 1e8c51477083..77e7714454e7 100644 --- a/stdlib/_winapi.pyi +++ b/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": diff --git a/stdlib/argparse.pyi b/stdlib/argparse.pyi index 0a56aa4f4b59..0f933e58d78d 100644 --- a/stdlib/argparse.pyi +++ b/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): diff --git a/stdlib/array.pyi b/stdlib/array.pyi index b3d1a5a851cb..f0cb64cef269 100644 --- a/stdlib/array.pyi +++ b/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"] diff --git a/stdlib/ast.pyi b/stdlib/ast.pyi index 3804287c7e0a..199e4f2acb68 100644 --- a/stdlib/ast.pyi +++ b/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): diff --git a/stdlib/asyncio/base_events.pyi b/stdlib/asyncio/base_events.pyi index 9eda1ad19ba3..7742651fea2a 100644 --- a/stdlib/asyncio/base_events.pyi +++ b/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): diff --git a/stdlib/asyncio/base_futures.pyi b/stdlib/asyncio/base_futures.pyi index 1b7fe4671ca8..8a973d1618f4 100644 --- a/stdlib/asyncio/base_futures.pyi +++ b/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): diff --git a/stdlib/asyncio/base_subprocess.pyi b/stdlib/asyncio/base_subprocess.pyi index e0eaffcaf688..963cfa93de28 100644 --- a/stdlib/asyncio/base_subprocess.pyi +++ b/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 diff --git a/stdlib/asyncio/events.pyi b/stdlib/asyncio/events.pyi index 10dbad98e8f6..ae566234160b 100644 --- a/stdlib/asyncio/events.pyi +++ b/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 diff --git a/stdlib/asyncio/format_helpers.pyi b/stdlib/asyncio/format_helpers.pyi index 63d8c55f48ce..4e2ef8d3f274 100644 --- a/stdlib/asyncio/format_helpers.pyi +++ b/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: diff --git a/stdlib/asyncio/futures.pyi b/stdlib/asyncio/futures.pyi index 2b0b93a09638..692d263f673b 100644 --- a/stdlib/asyncio/futures.pyi +++ b/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 diff --git a/stdlib/asyncio/locks.pyi b/stdlib/asyncio/locks.pyi index 01b1c5b4591d..2758e0c46919 100644 --- a/stdlib/asyncio/locks.pyi +++ b/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 diff --git a/stdlib/asyncio/proactor_events.pyi b/stdlib/asyncio/proactor_events.pyi index 4ffb40160420..21247401c9ba 100644 --- a/stdlib/asyncio/proactor_events.pyi +++ b/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 diff --git a/stdlib/asyncio/runners.pyi b/stdlib/asyncio/runners.pyi index 7e799dd22fd8..32cd839f2f79 100644 --- a/stdlib/asyncio/runners.pyi +++ b/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") diff --git a/stdlib/asyncio/sslproto.pyi b/stdlib/asyncio/sslproto.pyi index 4ecd7a11dd56..619e329bfb43 100644 --- a/stdlib/asyncio/sslproto.pyi +++ b/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 diff --git a/stdlib/asyncio/staggered.pyi b/stdlib/asyncio/staggered.pyi index fc4bfad76984..610d6f70b614 100644 --- a/stdlib/asyncio/staggered.pyi +++ b/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 diff --git a/stdlib/asyncio/streams.pyi b/stdlib/asyncio/streams.pyi index 55bd7dbdbf52..77b9c9402c23 100644 --- a/stdlib/asyncio/streams.pyi +++ b/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 diff --git a/stdlib/asyncio/subprocess.pyi b/stdlib/asyncio/subprocess.pyi index 7129309dec42..55093a3ebd9f 100644 --- a/stdlib/asyncio/subprocess.pyi +++ b/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): diff --git a/stdlib/asyncio/taskgroups.pyi b/stdlib/asyncio/taskgroups.pyi index ef04614c3c15..58e3d41e53f1 100644 --- a/stdlib/asyncio/taskgroups.pyi +++ b/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 diff --git a/stdlib/asyncio/tasks.pyi b/stdlib/asyncio/tasks.pyi index e430f9647dea..4a8e565afb2f 100644 --- a/stdlib/asyncio/tasks.pyi +++ b/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 diff --git a/stdlib/asyncio/threads.pyi b/stdlib/asyncio/threads.pyi index ac3a5c56b222..88c4fddcaa3f 100644 --- a/stdlib/asyncio/threads.pyi +++ b/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",) diff --git a/stdlib/asyncio/transports.pyi b/stdlib/asyncio/transports.pyi index 90e54b547a87..a8cd753c2af8 100644 --- a/stdlib/asyncio/transports.pyi +++ b/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") diff --git a/stdlib/asyncio/trsock.pyi b/stdlib/asyncio/trsock.pyi index d9bf3183b2fa..20df2a78a5ab 100644 --- a/stdlib/asyncio/trsock.pyi +++ b/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 diff --git a/stdlib/asyncio/unix_events.pyi b/stdlib/asyncio/unix_events.pyi index 78d87dc4e9e9..ca28ee04125a 100644 --- a/stdlib/asyncio/unix_events.pyi +++ b/stdlib/asyncio/unix_events.pyi @@ -2,8 +2,9 @@ import sys import types from _typeshed import Self from abc import ABCMeta, abstractmethod +from collections.abc import Callable from socket import socket -from typing import Any, Callable +from typing import Any from typing_extensions import Literal from .base_events import Server diff --git a/stdlib/asyncio/windows_events.pyi b/stdlib/asyncio/windows_events.pyi index 1e4d286386c8..d33210bc1297 100644 --- a/stdlib/asyncio/windows_events.pyi +++ b/stdlib/asyncio/windows_events.pyi @@ -1,7 +1,8 @@ import socket import sys from _typeshed import WriteableBuffer -from typing import IO, Any, Callable, ClassVar, NoReturn +from collections.abc import Callable +from typing import IO, Any, ClassVar, NoReturn from typing_extensions import Literal from . import events, futures, proactor_events, selector_events, streams, windows_utils diff --git a/stdlib/asyncio/windows_utils.pyi b/stdlib/asyncio/windows_utils.pyi index 1156f905659e..0a79635b3d4e 100644 --- a/stdlib/asyncio/windows_utils.pyi +++ b/stdlib/asyncio/windows_utils.pyi @@ -1,8 +1,9 @@ import subprocess import sys from _typeshed import Self +from collections.abc import Callable from types import TracebackType -from typing import Any, AnyStr, Callable, Protocol +from typing import Any, AnyStr, Protocol from typing_extensions import Literal if sys.platform == "win32": diff --git a/stdlib/atexit.pyi b/stdlib/atexit.pyi index ba0c7dfaf6b1..095ab5f9b26d 100644 --- a/stdlib/atexit.pyi +++ b/stdlib/atexit.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 ParamSpec _T = TypeVar("_T") diff --git a/stdlib/bdb.pyi b/stdlib/bdb.pyi index 5f463ead2711..bbd0f20af6c8 100644 --- a/stdlib/bdb.pyi +++ b/stdlib/bdb.pyi @@ -1,6 +1,7 @@ from _typeshed import ExcInfo +from collections.abc import Callable, Iterable, Mapping from types import CodeType, FrameType, TracebackType -from typing import IO, Any, Callable, Iterable, Mapping, SupportsInt, TypeVar +from typing import IO, Any, SupportsInt, TypeVar from typing_extensions import Literal, ParamSpec, TypeAlias __all__ = ["BdbQuit", "Bdb", "Breakpoint"] diff --git a/stdlib/builtins.pyi b/stdlib/builtins.pyi index 5db5de3db023..e4dd03f14fb2 100644 --- a/stdlib/builtins.pyi +++ b/stdlib/builtins.pyi @@ -22,29 +22,31 @@ from _typeshed import ( SupportsTrunc, SupportsWrite, ) -from collections.abc import Callable +from collections.abc import ( + Awaitable, + Callable, + Iterable, + Iterator, + Mapping, + MutableMapping, + MutableSet, + Reversible, + Set as AbstractSet, + Sized, +) from io import BufferedRandom, BufferedReader, BufferedWriter, FileIO, TextIOWrapper from types import CodeType, TracebackType, _Cell from typing import ( IO, - AbstractSet, Any, - Awaitable, BinaryIO, ByteString, ClassVar, Generic, - Iterable, - Iterator, - Mapping, - MutableMapping, MutableSequence, - MutableSet, NoReturn, Protocol, - Reversible, Sequence, - Sized, SupportsAbs, SupportsBytes, SupportsComplex, diff --git a/stdlib/bz2.pyi b/stdlib/bz2.pyi index a17f9c43472b..cea317e28037 100644 --- a/stdlib/bz2.pyi +++ b/stdlib/bz2.pyi @@ -2,7 +2,8 @@ import _compression import sys from _compression import BaseStream from _typeshed import ReadableBuffer, Self, StrOrBytesPath, WriteableBuffer -from typing import IO, Any, Iterable, Protocol, TextIO, overload +from collections.abc import Iterable +from typing import IO, Any, Protocol, TextIO, overload from typing_extensions import Literal, SupportsIndex, TypeAlias, final __all__ = ["BZ2File", "BZ2Compressor", "BZ2Decompressor", "open", "compress", "decompress"] diff --git a/stdlib/cProfile.pyi b/stdlib/cProfile.pyi index 7ee7d1bdd0ec..6e21fc92ade5 100644 --- a/stdlib/cProfile.pyi +++ b/stdlib/cProfile.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import Self, StrOrBytesPath +from collections.abc import Callable from types import CodeType -from typing import Any, Callable, TypeVar +from typing import Any, TypeVar from typing_extensions import ParamSpec, TypeAlias __all__ = ["run", "runctx", "Profile"] diff --git a/stdlib/cgitb.pyi b/stdlib/cgitb.pyi index 6c56e897eafc..ea5a8341bc5e 100644 --- a/stdlib/cgitb.pyi +++ b/stdlib/cgitb.pyi @@ -1,6 +1,7 @@ from _typeshed import OptExcInfo, StrOrBytesPath +from collections.abc import Callable from types import FrameType, TracebackType -from typing import IO, Any, Callable +from typing import IO, Any __UNDEF__: object # undocumented sentinel diff --git a/stdlib/cmd.pyi b/stdlib/cmd.pyi index d1166db0f507..ddefff2edf05 100644 --- a/stdlib/cmd.pyi +++ b/stdlib/cmd.pyi @@ -1,4 +1,5 @@ -from typing import IO, Any, Callable +from collections.abc import Callable +from typing import IO, Any from typing_extensions import Literal __all__ = ["Cmd"] diff --git a/stdlib/code.pyi b/stdlib/code.pyi index 185c15853b82..59318aa353e2 100644 --- a/stdlib/code.pyi +++ b/stdlib/code.pyi @@ -1,6 +1,7 @@ from codeop import CommandCompiler +from collections.abc import Callable, Mapping from types import CodeType -from typing import Any, Callable, Mapping +from typing import Any __all__ = ["InteractiveInterpreter", "InteractiveConsole", "interact", "compile_command"] diff --git a/stdlib/codecs.pyi b/stdlib/codecs.pyi index da9c3766b12e..bba7703c7d33 100644 --- a/stdlib/codecs.pyi +++ b/stdlib/codecs.pyi @@ -2,7 +2,8 @@ import sys import types from _typeshed import Self from abc import abstractmethod -from typing import IO, Any, BinaryIO, Callable, Generator, Iterable, Iterator, Protocol, TextIO, overload +from collections.abc import Callable, Generator, Iterable, Iterator +from typing import IO, Any, BinaryIO, Protocol, TextIO, overload from typing_extensions import Literal, TypeAlias __all__ = [ diff --git a/stdlib/concurrent/futures/_base.pyi b/stdlib/concurrent/futures/_base.pyi index 4967d01f90dc..5b756d87d118 100644 --- a/stdlib/concurrent/futures/_base.pyi +++ b/stdlib/concurrent/futures/_base.pyi @@ -2,10 +2,10 @@ import sys import threading from _typeshed import Self from abc import abstractmethod -from collections.abc import Container, Iterable, Iterator, Sequence +from collections.abc import Callable, Container, Iterable, Iterator, Sequence from logging import Logger from types import TracebackType -from typing import Any, Callable, Generic, Protocol, TypeVar, overload +from typing import Any, Generic, Protocol, TypeVar, overload from typing_extensions import Literal, ParamSpec, SupportsIndex if sys.version_info >= (3, 9): diff --git a/stdlib/concurrent/futures/process.pyi b/stdlib/concurrent/futures/process.pyi index 0c6c403949ad..4cfa8276897f 100644 --- a/stdlib/concurrent/futures/process.pyi +++ b/stdlib/concurrent/futures/process.pyi @@ -1,11 +1,11 @@ import sys -from collections.abc import Generator, Iterable, Mapping, MutableMapping, MutableSequence +from collections.abc import Callable, Generator, Iterable, Mapping, MutableMapping, MutableSequence from multiprocessing.connection import Connection from multiprocessing.context import BaseContext, Process from multiprocessing.queues import Queue, SimpleQueue from threading import Lock, Semaphore, Thread from types import TracebackType -from typing import Any, Callable, Generic, TypeVar +from typing import Any, Generic, TypeVar from weakref import ref from ._base import Executor, Future diff --git a/stdlib/concurrent/futures/thread.pyi b/stdlib/concurrent/futures/thread.pyi index 46ca681c54fc..e10254531788 100644 --- a/stdlib/concurrent/futures/thread.pyi +++ b/stdlib/concurrent/futures/thread.pyi @@ -1,8 +1,8 @@ import queue import sys -from collections.abc import Iterable, Mapping, Set as AbstractSet +from collections.abc import Callable, Iterable, Mapping, Set as AbstractSet from threading import Lock, Semaphore, Thread -from typing import Any, Callable, Generic, TypeVar +from typing import Any, Generic, TypeVar from weakref import ref from ._base import Executor, Future diff --git a/stdlib/contextlib.pyi b/stdlib/contextlib.pyi index 2b2c6b55da1f..c93eeac3b44f 100644 --- a/stdlib/contextlib.pyi +++ b/stdlib/contextlib.pyi @@ -1,21 +1,8 @@ import sys from _typeshed import Self, StrOrBytesPath +from collections.abc import AsyncGenerator, AsyncIterator, Awaitable, Callable, Generator, Iterator from types import TracebackType -from typing import ( # noqa: Y027 - IO, - Any, - AsyncGenerator, - AsyncIterator, - Awaitable, - Callable, - ContextManager, - Generator, - Generic, - Iterator, - Protocol, - TypeVar, - overload, -) +from typing import IO, Any, ContextManager, Generic, Protocol, TypeVar, overload # noqa: Y027 from typing_extensions import ParamSpec, TypeAlias if sys.version_info >= (3, 11): diff --git a/stdlib/contextvars.pyi b/stdlib/contextvars.pyi index 6b5661dd69eb..341cd8491caf 100644 --- a/stdlib/contextvars.pyi +++ b/stdlib/contextvars.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, Callable, ClassVar, Generic, Iterator, Mapping, TypeVar, overload +from collections.abc import Callable, Iterator, Mapping +from typing import Any, ClassVar, Generic, TypeVar, overload from typing_extensions import ParamSpec, final if sys.version_info >= (3, 9): diff --git a/stdlib/copyreg.pyi b/stdlib/copyreg.pyi index a570b1fe6885..4403550b587e 100644 --- a/stdlib/copyreg.pyi +++ b/stdlib/copyreg.pyi @@ -1,4 +1,5 @@ -from typing import Any, Callable, Hashable, SupportsInt, TypeVar, Union +from collections.abc import Callable, Hashable +from typing import Any, SupportsInt, TypeVar, Union from typing_extensions import TypeAlias _T = TypeVar("_T") diff --git a/stdlib/ctypes/__init__.pyi b/stdlib/ctypes/__init__.pyi index 6df04a024683..53a382ec0e71 100644 --- a/stdlib/ctypes/__init__.pyi +++ b/stdlib/ctypes/__init__.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import ReadableBuffer, Self, WriteableBuffer from abc import abstractmethod -from typing import Any, Callable, ClassVar, Generic, Iterable, Iterator, Mapping, Sequence, TypeVar, Union as _UnionT, overload +from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence +from typing import Any, ClassVar, Generic, TypeVar, Union as _UnionT, overload from typing_extensions import TypeAlias if sys.version_info >= (3, 9): diff --git a/stdlib/curses/__init__.pyi b/stdlib/curses/__init__.pyi index ee74c13b6b50..f80ed442ea9c 100644 --- a/stdlib/curses/__init__.pyi +++ b/stdlib/curses/__init__.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, Callable, TypeVar +from collections.abc import Callable +from typing import Any, TypeVar if sys.platform != "win32": from _curses import * diff --git a/stdlib/curses/textpad.pyi b/stdlib/curses/textpad.pyi index b8a9c843f402..ad9983431fc7 100644 --- a/stdlib/curses/textpad.pyi +++ b/stdlib/curses/textpad.pyi @@ -1,5 +1,5 @@ import sys -from typing import Callable +from collections.abc import Callable if sys.platform != "win32": from _curses import _CursesWindow diff --git a/stdlib/dataclasses.pyi b/stdlib/dataclasses.pyi index d82e9a2bb526..f58c6f9f1460 100644 --- a/stdlib/dataclasses.pyi +++ b/stdlib/dataclasses.pyi @@ -2,7 +2,8 @@ import enum import sys import types from builtins import type as Type # alias to avoid name clashes with fields named "type" -from typing import Any, Callable, Generic, Iterable, Mapping, Protocol, TypeVar, overload +from collections.abc import Callable, Iterable, Mapping +from typing import Any, Generic, Protocol, TypeVar, overload from typing_extensions import Literal if sys.version_info >= (3, 9): diff --git a/stdlib/dbm/__init__.pyi b/stdlib/dbm/__init__.pyi index b80d0ce7596a..9e99f0d5e74c 100644 --- a/stdlib/dbm/__init__.pyi +++ b/stdlib/dbm/__init__.pyi @@ -1,6 +1,6 @@ from _typeshed import Self +from collections.abc import Iterator, MutableMapping from types import TracebackType -from typing import Iterator, MutableMapping from typing_extensions import Literal, TypeAlias __all__ = ["open", "whichdb", "error"] diff --git a/stdlib/dbm/dumb.pyi b/stdlib/dbm/dumb.pyi index 70798f90706e..4fd199f19728 100644 --- a/stdlib/dbm/dumb.pyi +++ b/stdlib/dbm/dumb.pyi @@ -1,6 +1,6 @@ from _typeshed import Self +from collections.abc import Iterator, MutableMapping from types import TracebackType -from typing import Iterator, MutableMapping from typing_extensions import TypeAlias __all__ = ["error", "open"] diff --git a/stdlib/difflib.pyi b/stdlib/difflib.pyi index a572430155e9..87e3768034bf 100644 --- a/stdlib/difflib.pyi +++ b/stdlib/difflib.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, AnyStr, Callable, Generic, Iterable, Iterator, NamedTuple, Sequence, TypeVar, overload +from collections.abc import Callable, Iterable, Iterator, Sequence +from typing import Any, AnyStr, Generic, NamedTuple, TypeVar, overload if sys.version_info >= (3, 9): from types import GenericAlias diff --git a/stdlib/dis.pyi b/stdlib/dis.pyi index ff8f4fa91993..9a99d4498668 100644 --- a/stdlib/dis.pyi +++ b/stdlib/dis.pyi @@ -1,8 +1,9 @@ import sys import types from _typeshed import Self +from collections.abc import Callable, Iterator from opcode import * # `dis` re-exports it as a part of public API -from typing import IO, Any, Callable, Iterator, NamedTuple +from typing import IO, Any, NamedTuple from typing_extensions import TypeAlias __all__ = [ diff --git a/stdlib/distutils/ccompiler.pyi b/stdlib/distutils/ccompiler.pyi index 89ec0e91de14..ed823f7c070f 100644 --- a/stdlib/distutils/ccompiler.pyi +++ b/stdlib/distutils/ccompiler.pyi @@ -1,4 +1,5 @@ -from typing import Any, Callable, Union +from collections.abc import Callable +from typing import Any, Union from typing_extensions import TypeAlias _Macro: TypeAlias = Union[tuple[str], tuple[str, str | None]] diff --git a/stdlib/distutils/cmd.pyi b/stdlib/distutils/cmd.pyi index 96a048c93f41..8163ae78fd8f 100644 --- a/stdlib/distutils/cmd.pyi +++ b/stdlib/distutils/cmd.pyi @@ -1,6 +1,7 @@ from abc import abstractmethod +from collections.abc import Callable, Iterable from distutils.dist import Distribution -from typing import Any, Callable, Iterable +from typing import Any class Command: sub_commands: list[tuple[str, Callable[[Command], bool] | None]] diff --git a/stdlib/distutils/core.pyi b/stdlib/distutils/core.pyi index 6564c9a86ded..199a4d70a953 100644 --- a/stdlib/distutils/core.pyi +++ b/stdlib/distutils/core.pyi @@ -1,7 +1,8 @@ +from collections.abc import Mapping from distutils.cmd import Command as Command from distutils.dist import Distribution as Distribution from distutils.extension import Extension as Extension -from typing import Any, Mapping +from typing import Any def setup( *, diff --git a/stdlib/distutils/dist.pyi b/stdlib/distutils/dist.pyi index c5b3afe7cc3b..ef47e4e4d15a 100644 --- a/stdlib/distutils/dist.pyi +++ b/stdlib/distutils/dist.pyi @@ -1,6 +1,7 @@ from _typeshed import StrOrBytesPath, SupportsWrite +from collections.abc import Iterable, Mapping from distutils.cmd import Command -from typing import IO, Any, Iterable, Mapping +from typing import IO, Any class DistributionMetadata: def __init__(self, path: int | StrOrBytesPath | None = ...) -> None: ... diff --git a/stdlib/distutils/fancy_getopt.pyi b/stdlib/distutils/fancy_getopt.pyi index d8869d94bca8..6a7124bd15ad 100644 --- a/stdlib/distutils/fancy_getopt.pyi +++ b/stdlib/distutils/fancy_getopt.pyi @@ -1,4 +1,5 @@ -from typing import Any, Iterable, Mapping, overload +from collections.abc import Iterable, Mapping +from typing import Any, overload from typing_extensions import TypeAlias _Option: TypeAlias = tuple[str, str | None, str] diff --git a/stdlib/distutils/file_util.pyi b/stdlib/distutils/file_util.pyi index a7f24105a678..b3127841bce8 100644 --- a/stdlib/distutils/file_util.pyi +++ b/stdlib/distutils/file_util.pyi @@ -1,4 +1,4 @@ -from typing import Sequence +from collections.abc import Sequence def copy_file( src: str, diff --git a/stdlib/distutils/filelist.pyi b/stdlib/distutils/filelist.pyi index 2b436938f13e..361cb13f0c47 100644 --- a/stdlib/distutils/filelist.pyi +++ b/stdlib/distutils/filelist.pyi @@ -1,4 +1,5 @@ -from typing import Iterable, Pattern, overload +from collections.abc import Iterable +from typing import Pattern, overload from typing_extensions import Literal # class is entirely undocumented diff --git a/stdlib/distutils/sysconfig.pyi b/stdlib/distutils/sysconfig.pyi index 3f579be40882..bf7db9c8f06b 100644 --- a/stdlib/distutils/sysconfig.pyi +++ b/stdlib/distutils/sysconfig.pyi @@ -1,5 +1,5 @@ +from collections.abc import Mapping from distutils.ccompiler import CCompiler -from typing import Mapping PREFIX: str EXEC_PREFIX: str diff --git a/stdlib/doctest.pyi b/stdlib/doctest.pyi index 47c34ccb1f12..c767436c2be8 100644 --- a/stdlib/doctest.pyi +++ b/stdlib/doctest.pyi @@ -1,7 +1,8 @@ import types import unittest from _typeshed import ExcInfo -from typing import Any, Callable, NamedTuple +from collections.abc import Callable +from typing import Any, NamedTuple from typing_extensions import TypeAlias __all__ = [ diff --git a/stdlib/email/__init__.pyi b/stdlib/email/__init__.pyi index 5eac7bf89297..8c3e8201d45e 100644 --- a/stdlib/email/__init__.pyi +++ b/stdlib/email/__init__.pyi @@ -1,6 +1,7 @@ +from collections.abc import Callable from email.message import Message from email.policy import Policy -from typing import IO, Callable, TypeVar, Union +from typing import IO, TypeVar, Union from typing_extensions import TypeAlias # Definitions imported by multiple submodules in typeshed diff --git a/stdlib/email/_header_value_parser.pyi b/stdlib/email/_header_value_parser.pyi index 749b6454a8f8..abe6ec63abb1 100644 --- a/stdlib/email/_header_value_parser.pyi +++ b/stdlib/email/_header_value_parser.pyi @@ -1,8 +1,9 @@ import sys from _typeshed import Self +from collections.abc import Iterable, Iterator from email.errors import HeaderParseError, MessageDefect from email.policy import Policy -from typing import Any, Iterable, Iterator, Pattern +from typing import Any, Pattern from typing_extensions import Final WSP: Final[set[str]] diff --git a/stdlib/email/charset.pyi b/stdlib/email/charset.pyi index fd3de9ceace2..236908537f83 100644 --- a/stdlib/email/charset.pyi +++ b/stdlib/email/charset.pyi @@ -1,4 +1,4 @@ -from typing import Iterator +from collections.abc import Iterator __all__ = ["Charset", "add_alias", "add_charset", "add_codec"] diff --git a/stdlib/email/contentmanager.pyi b/stdlib/email/contentmanager.pyi index 68fe99c8c09f..3ac665eaa7bf 100644 --- a/stdlib/email/contentmanager.pyi +++ b/stdlib/email/contentmanager.pyi @@ -1,5 +1,6 @@ +from collections.abc import Callable from email.message import Message -from typing import Any, Callable +from typing import Any class ContentManager: def __init__(self) -> None: ... diff --git a/stdlib/email/feedparser.pyi b/stdlib/email/feedparser.pyi index b1c7e0f7d127..33da0aa3c767 100644 --- a/stdlib/email/feedparser.pyi +++ b/stdlib/email/feedparser.pyi @@ -1,7 +1,8 @@ +from collections.abc import Callable from email import _MessageT from email.message import Message from email.policy import Policy -from typing import Callable, Generic, overload +from typing import Generic, overload __all__ = ["FeedParser", "BytesFeedParser"] diff --git a/stdlib/email/iterators.pyi b/stdlib/email/iterators.pyi index ad5517712d25..29068819ac15 100644 --- a/stdlib/email/iterators.pyi +++ b/stdlib/email/iterators.pyi @@ -1,6 +1,6 @@ from _typeshed import SupportsWrite +from collections.abc import Iterator from email.message import Message -from typing import Iterator __all__ = ["body_line_iterator", "typed_subpart_iterator", "walk"] diff --git a/stdlib/email/message.pyi b/stdlib/email/message.pyi index d310c21df761..a67651f7730f 100644 --- a/stdlib/email/message.pyi +++ b/stdlib/email/message.pyi @@ -1,9 +1,10 @@ +from collections.abc import Generator, Iterator, Sequence from email import _ParamsType, _ParamType from email.charset import Charset from email.contentmanager import ContentManager from email.errors import MessageDefect from email.policy import Policy -from typing import Any, Generator, Iterator, Sequence, TypeVar +from typing import Any, TypeVar from typing_extensions import TypeAlias __all__ = ["Message", "EmailMessage"] diff --git a/stdlib/email/parser.pyi b/stdlib/email/parser.pyi index bd1e487976d1..a19f1bae77f3 100644 --- a/stdlib/email/parser.pyi +++ b/stdlib/email/parser.pyi @@ -1,8 +1,9 @@ import email.feedparser +from collections.abc import Callable from email import _MessageT from email.message import Message from email.policy import Policy -from typing import BinaryIO, Callable, TextIO +from typing import BinaryIO, TextIO from typing_extensions import TypeAlias __all__ = ["Parser", "HeaderParser", "BytesParser", "BytesHeaderParser", "FeedParser", "BytesFeedParser"] diff --git a/stdlib/email/policy.pyi b/stdlib/email/policy.pyi index d4ebb1fd5e37..4df3c1e48b07 100644 --- a/stdlib/email/policy.pyi +++ b/stdlib/email/policy.pyi @@ -1,9 +1,10 @@ from abc import ABCMeta, abstractmethod +from collections.abc import Callable from email.contentmanager import ContentManager from email.errors import MessageDefect from email.header import Header from email.message import Message -from typing import Any, Callable +from typing import Any __all__ = ["Compat32", "compat32", "Policy", "EmailPolicy", "default", "strict", "SMTP", "HTTP"] diff --git a/stdlib/errno.pyi b/stdlib/errno.pyi index 12410af23e71..9ef1fe6e7618 100644 --- a/stdlib/errno.pyi +++ b/stdlib/errno.pyi @@ -1,4 +1,4 @@ -from typing import Mapping +from collections.abc import Mapping errorcode: Mapping[int, str] diff --git a/stdlib/filecmp.pyi b/stdlib/filecmp.pyi index 7c606af40791..a6747dd504a3 100644 --- a/stdlib/filecmp.pyi +++ b/stdlib/filecmp.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import StrOrBytesPath +from collections.abc import Callable, Iterable, Sequence from os import PathLike -from typing import Any, AnyStr, Callable, Generic, Iterable, Sequence +from typing import Any, AnyStr, Generic from typing_extensions import Literal if sys.version_info >= (3, 9): diff --git a/stdlib/fileinput.pyi b/stdlib/fileinput.pyi index a3b62948ca20..0ef8c14ddaac 100644 --- a/stdlib/fileinput.pyi +++ b/stdlib/fileinput.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import Self, StrOrBytesPath +from collections.abc import Callable, Iterable, Iterator from types import TracebackType -from typing import IO, Any, AnyStr, Callable, Generic, Iterable, Iterator +from typing import IO, Any, AnyStr, Generic __all__ = [ "input", diff --git a/stdlib/fnmatch.pyi b/stdlib/fnmatch.pyi index 8351fce59ebb..7051c999c430 100644 --- a/stdlib/fnmatch.pyi +++ b/stdlib/fnmatch.pyi @@ -1,4 +1,5 @@ -from typing import AnyStr, Iterable +from collections.abc import Iterable +from typing import AnyStr __all__ = ["filter", "fnmatch", "fnmatchcase", "translate"] diff --git a/stdlib/formatter.pyi b/stdlib/formatter.pyi index d4f43de3191a..0aac0a5f918c 100644 --- a/stdlib/formatter.pyi +++ b/stdlib/formatter.pyi @@ -1,4 +1,5 @@ -from typing import IO, Any, Iterable +from collections.abc import Iterable +from typing import IO, Any from typing_extensions import TypeAlias AS_IS: None diff --git a/stdlib/ftplib.pyi b/stdlib/ftplib.pyi index 4a5dad0dd14f..925ad5884700 100644 --- a/stdlib/ftplib.pyi +++ b/stdlib/ftplib.pyi @@ -1,9 +1,10 @@ import sys from _typeshed import Self, SupportsRead, SupportsReadline +from collections.abc import Callable, Iterable, Iterator from socket import socket from ssl import SSLContext from types import TracebackType -from typing import Any, Callable, Iterable, Iterator, TextIO +from typing import Any, TextIO from typing_extensions import Literal __all__ = ["FTP", "error_reply", "error_temp", "error_perm", "error_proto", "all_errors", "FTP_TLS"] diff --git a/stdlib/functools.pyi b/stdlib/functools.pyi index 4fd25e634ecc..6681b8c7f759 100644 --- a/stdlib/functools.pyi +++ b/stdlib/functools.pyi @@ -1,7 +1,8 @@ import sys import types from _typeshed import Self, SupportsAllComparisons, SupportsItems -from typing import Any, Callable, Generic, Hashable, Iterable, NamedTuple, Sequence, Sized, TypeVar, overload +from collections.abc import Callable, Hashable, Iterable, Sequence, Sized +from typing import Any, Generic, NamedTuple, TypeVar, overload from typing_extensions import Literal, TypeAlias, final if sys.version_info >= (3, 9): diff --git a/stdlib/gc.pyi b/stdlib/gc.pyi index 9a06e3e4ccfd..98b92e109f82 100644 --- a/stdlib/gc.pyi +++ b/stdlib/gc.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, Callable +from collections.abc import Callable +from typing import Any from typing_extensions import Literal, TypeAlias DEBUG_COLLECTABLE: Literal[2] diff --git a/stdlib/genericpath.pyi b/stdlib/genericpath.pyi index 3abedda262ea..984d0c3cf51e 100644 --- a/stdlib/genericpath.pyi +++ b/stdlib/genericpath.pyi @@ -1,6 +1,7 @@ import os from _typeshed import BytesPath, StrOrBytesPath, StrPath, SupportsRichComparisonT -from typing import Sequence, overload +from collections.abc import Sequence +from typing import overload from typing_extensions import Literal __all__ = [ diff --git a/stdlib/glob.pyi b/stdlib/glob.pyi index ced0ceceb205..c63563d19f58 100644 --- a/stdlib/glob.pyi +++ b/stdlib/glob.pyi @@ -1,6 +1,7 @@ import sys from _typeshed import StrOrBytesPath -from typing import AnyStr, Iterator +from collections.abc import Iterator +from typing import AnyStr __all__ = ["escape", "glob", "iglob"] diff --git a/stdlib/graphlib.pyi b/stdlib/graphlib.pyi index cae2a07e95c6..2fca402bf906 100644 --- a/stdlib/graphlib.pyi +++ b/stdlib/graphlib.pyi @@ -1,6 +1,7 @@ import sys from _typeshed import SupportsItems -from typing import Any, Generic, Iterable, TypeVar +from collections.abc import Iterable +from typing import Any, Generic, TypeVar __all__ = ["TopologicalSorter", "CycleError"] diff --git a/stdlib/hashlib.pyi b/stdlib/hashlib.pyi index 4332153d281c..79c843fd4305 100644 --- a/stdlib/hashlib.pyi +++ b/stdlib/hashlib.pyi @@ -1,6 +1,6 @@ import sys from _typeshed import ReadableBuffer, Self -from typing import AbstractSet +from collections.abc import Set as AbstractSet from typing_extensions import final __all__ = ( diff --git a/stdlib/heapq.pyi b/stdlib/heapq.pyi index a7a787d44e62..f07afc7af706 100644 --- a/stdlib/heapq.pyi +++ b/stdlib/heapq.pyi @@ -1,6 +1,7 @@ from _heapq import * from _typeshed import SupportsRichComparison -from typing import Any, Callable, Iterable, TypeVar +from collections.abc import Callable, Iterable +from typing import Any, TypeVar __all__ = ["heappush", "heappop", "heapify", "heapreplace", "merge", "nlargest", "nsmallest", "heappushpop"] diff --git a/stdlib/hmac.pyi b/stdlib/hmac.pyi index df180f783c02..858e46a71b68 100644 --- a/stdlib/hmac.pyi +++ b/stdlib/hmac.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import ReadableBuffer +from collections.abc import Callable from types import ModuleType -from typing import Any, AnyStr, Callable, overload +from typing import Any, AnyStr, overload from typing_extensions import TypeAlias # TODO more precise type for object of hashlib diff --git a/stdlib/http/client.pyi b/stdlib/http/client.pyi index c8090af3e831..235b6d6b4951 100644 --- a/stdlib/http/client.pyi +++ b/stdlib/http/client.pyi @@ -4,8 +4,9 @@ import ssl import sys import types from _typeshed import Self, WriteableBuffer +from collections.abc import Callable, Iterable, Iterator, Mapping from socket import socket -from typing import IO, Any, BinaryIO, Callable, Iterable, Iterator, Mapping, Protocol, TypeVar, overload +from typing import IO, Any, BinaryIO, Protocol, TypeVar, overload from typing_extensions import TypeAlias __all__ = [ diff --git a/stdlib/http/cookiejar.pyi b/stdlib/http/cookiejar.pyi index 4fb1c38c6ab8..83da7faaf0fc 100644 --- a/stdlib/http/cookiejar.pyi +++ b/stdlib/http/cookiejar.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import StrPath +from collections.abc import Iterable, Iterator, Sequence from http.client import HTTPResponse -from typing import ClassVar, Iterable, Iterator, Pattern, Sequence, TypeVar, overload +from typing import ClassVar, Pattern, TypeVar, overload from urllib.request import Request __all__ = [ diff --git a/stdlib/http/cookies.pyi b/stdlib/http/cookies.pyi index 774b45e50d4b..e5aa2c1609db 100644 --- a/stdlib/http/cookies.pyi +++ b/stdlib/http/cookies.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, Generic, Iterable, Mapping, TypeVar, overload +from collections.abc import Iterable, Mapping +from typing import Any, Generic, TypeVar, overload from typing_extensions import TypeAlias if sys.version_info >= (3, 9): diff --git a/stdlib/http/server.pyi b/stdlib/http/server.pyi index 53159b65ec14..ad314cec1541 100644 --- a/stdlib/http/server.pyi +++ b/stdlib/http/server.pyi @@ -3,7 +3,8 @@ import io import socketserver import sys from _typeshed import StrPath, SupportsRead, SupportsWrite -from typing import Any, AnyStr, BinaryIO, ClassVar, Mapping, Sequence +from collections.abc import Mapping, Sequence +from typing import Any, AnyStr, BinaryIO, ClassVar if sys.version_info >= (3, 7): __all__ = ["HTTPServer", "ThreadingHTTPServer", "BaseHTTPRequestHandler", "SimpleHTTPRequestHandler", "CGIHTTPRequestHandler"] diff --git a/stdlib/imaplib.pyi b/stdlib/imaplib.pyi index b295292770a1..eef1c1957769 100644 --- a/stdlib/imaplib.pyi +++ b/stdlib/imaplib.pyi @@ -3,10 +3,11 @@ import sys import time from _typeshed import Self from builtins import list as _list # conflicts with a method named "list" +from collections.abc import Callable from socket import socket as _socket from ssl import SSLContext, SSLSocket from types import TracebackType -from typing import IO, Any, Callable, Pattern +from typing import IO, Any, Pattern from typing_extensions import Literal, TypeAlias __all__ = ["IMAP4", "IMAP4_stream", "Internaldate2tuple", "Int2AP", "ParseFlags", "Time2Internaldate", "IMAP4_SSL"] diff --git a/stdlib/imghdr.pyi b/stdlib/imghdr.pyi index af046e899326..5f439779a69c 100644 --- a/stdlib/imghdr.pyi +++ b/stdlib/imghdr.pyi @@ -1,5 +1,6 @@ from _typeshed import StrPath -from typing import Any, BinaryIO, Callable, Protocol, overload +from collections.abc import Callable +from typing import Any, BinaryIO, Protocol, overload __all__ = ["what"] diff --git a/stdlib/importlib/__init__.pyi b/stdlib/importlib/__init__.pyi index 0e99786775b0..42401a00bdeb 100644 --- a/stdlib/importlib/__init__.pyi +++ b/stdlib/importlib/__init__.pyi @@ -1,6 +1,6 @@ +from collections.abc import Mapping, Sequence from importlib.abc import Loader from types import ModuleType -from typing import Mapping, Sequence __all__ = ["__import__", "import_module", "invalidate_caches", "reload"] diff --git a/stdlib/importlib/abc.pyi b/stdlib/importlib/abc.pyi index e020b9e9cf4d..63fd02f7b3d5 100644 --- a/stdlib/importlib/abc.pyi +++ b/stdlib/importlib/abc.pyi @@ -10,9 +10,10 @@ from _typeshed import ( StrPath, ) from abc import ABCMeta, abstractmethod +from collections.abc import Iterator, Mapping, Sequence from importlib.machinery import ModuleSpec from io import BufferedRandom, BufferedReader, BufferedWriter, FileIO, TextIOWrapper -from typing import IO, Any, BinaryIO, Iterator, Mapping, NoReturn, Protocol, Sequence, overload, runtime_checkable +from typing import IO, Any, BinaryIO, NoReturn, Protocol, overload, runtime_checkable from typing_extensions import Literal, TypeAlias _Path: TypeAlias = bytes | str diff --git a/stdlib/importlib/machinery.pyi b/stdlib/importlib/machinery.pyi index f15ac48af5c5..09abdc6f34fd 100644 --- a/stdlib/importlib/machinery.pyi +++ b/stdlib/importlib/machinery.pyi @@ -1,7 +1,8 @@ import importlib.abc import sys import types -from typing import Any, Callable, Iterable, Sequence +from collections.abc import Callable, Iterable, Sequence +from typing import Any if sys.version_info >= (3, 8): from importlib.metadata import DistributionFinder, PathDistribution diff --git a/stdlib/importlib/metadata/__init__.pyi b/stdlib/importlib/metadata/__init__.pyi index 52c5547a6128..1f32f0770b37 100644 --- a/stdlib/importlib/metadata/__init__.pyi +++ b/stdlib/importlib/metadata/__init__.pyi @@ -2,12 +2,12 @@ import abc import pathlib import sys from _typeshed import Self, StrPath -from collections.abc import Mapping +from collections.abc import Iterable, Mapping from email.message import Message from importlib.abc import MetaPathFinder from os import PathLike from pathlib import Path -from typing import Any, ClassVar, Iterable, NamedTuple, Pattern, overload +from typing import Any, ClassVar, NamedTuple, Pattern, overload if sys.version_info >= (3, 10): __all__ = [ diff --git a/stdlib/importlib/metadata/_meta.pyi b/stdlib/importlib/metadata/_meta.pyi index a5e5733396d7..a1101df0d5ce 100644 --- a/stdlib/importlib/metadata/_meta.pyi +++ b/stdlib/importlib/metadata/_meta.pyi @@ -1,4 +1,5 @@ -from typing import Any, Iterator, Protocol, TypeVar +from collections.abc import Iterator +from typing import Any, Protocol, TypeVar _T = TypeVar("_T") diff --git a/stdlib/importlib/resources.pyi b/stdlib/importlib/resources.pyi index 4ff941733312..04d7e8dcc967 100644 --- a/stdlib/importlib/resources.pyi +++ b/stdlib/importlib/resources.pyi @@ -1,9 +1,10 @@ import os import sys +from collections.abc import Iterator from contextlib import AbstractContextManager from pathlib import Path from types import ModuleType -from typing import Any, BinaryIO, Iterator, TextIO +from typing import Any, BinaryIO, TextIO from typing_extensions import TypeAlias if sys.version_info >= (3, 10): diff --git a/stdlib/importlib/util.pyi b/stdlib/importlib/util.pyi index c759d7def5be..2546c2c7882f 100644 --- a/stdlib/importlib/util.pyi +++ b/stdlib/importlib/util.pyi @@ -3,7 +3,8 @@ import importlib.machinery import sys import types from _typeshed import StrOrBytesPath -from typing import Any, Callable +from collections.abc import Callable +from typing import Any from typing_extensions import ParamSpec _P = ParamSpec("_P") diff --git a/stdlib/inspect.pyi b/stdlib/inspect.pyi index 680405ea1263..b549d6e96986 100644 --- a/stdlib/inspect.pyi +++ b/stdlib/inspect.pyi @@ -3,7 +3,7 @@ import sys import types from _typeshed import Self from collections import OrderedDict -from collections.abc import Awaitable, Callable, Generator, Mapping, Sequence, Set as AbstractSet +from collections.abc import Awaitable, Callable, Coroutine, Generator, Mapping, Sequence, Set as AbstractSet from types import ( AsyncGeneratorType, BuiltinFunctionType, @@ -30,7 +30,7 @@ if sys.version_info >= (3, 7): MethodWrapperType, ) -from typing import Any, ClassVar, Coroutine, NamedTuple, Protocol, TypeVar, Union +from typing import Any, ClassVar, NamedTuple, Protocol, TypeVar, Union from typing_extensions import Literal, ParamSpec, TypeGuard if sys.version_info >= (3, 11): diff --git a/stdlib/io.pyi b/stdlib/io.pyi index ef4789251cc3..327fd0d94a4d 100644 --- a/stdlib/io.pyi +++ b/stdlib/io.pyi @@ -2,9 +2,10 @@ import builtins import codecs import sys from _typeshed import ReadableBuffer, Self, StrOrBytesPath, WriteableBuffer +from collections.abc import Callable, Iterable, Iterator from os import _Opener from types import TracebackType -from typing import IO, Any, BinaryIO, Callable, Iterable, Iterator, TextIO +from typing import IO, Any, BinaryIO, TextIO from typing_extensions import Literal if sys.version_info >= (3, 8): diff --git a/stdlib/ipaddress.pyi b/stdlib/ipaddress.pyi index c0b3c9674ecc..1fdc6c57d8a8 100644 --- a/stdlib/ipaddress.pyi +++ b/stdlib/ipaddress.pyi @@ -1,6 +1,7 @@ import sys from _typeshed import Self -from typing import Any, Container, Generic, Iterable, Iterator, SupportsInt, TypeVar, overload +from collections.abc import Container, Iterable, Iterator +from typing import Any, Generic, SupportsInt, TypeVar, overload from typing_extensions import Literal, TypeAlias # Undocumented length constants diff --git a/stdlib/itertools.pyi b/stdlib/itertools.pyi index 35884bc30ac0..3648d0ce437e 100644 --- a/stdlib/itertools.pyi +++ b/stdlib/itertools.pyi @@ -1,6 +1,7 @@ import sys from _typeshed import Self -from typing import Any, Callable, Generic, Iterable, Iterator, SupportsComplex, SupportsFloat, SupportsInt, TypeVar, overload +from collections.abc import Callable, Iterable, Iterator +from typing import Any, Generic, SupportsComplex, SupportsFloat, SupportsInt, TypeVar, overload from typing_extensions import Literal, SupportsIndex, TypeAlias if sys.version_info >= (3, 9): diff --git a/stdlib/json/__init__.pyi b/stdlib/json/__init__.pyi index 8e1a36756398..2fd87622e1fe 100644 --- a/stdlib/json/__init__.pyi +++ b/stdlib/json/__init__.pyi @@ -1,5 +1,6 @@ from _typeshed import SupportsRead -from typing import IO, Any, Callable +from collections.abc import Callable +from typing import IO, Any from .decoder import JSONDecodeError as JSONDecodeError, JSONDecoder as JSONDecoder from .encoder import JSONEncoder as JSONEncoder diff --git a/stdlib/json/decoder.pyi b/stdlib/json/decoder.pyi index 866836758545..2060cf17dd05 100644 --- a/stdlib/json/decoder.pyi +++ b/stdlib/json/decoder.pyi @@ -1,4 +1,5 @@ -from typing import Any, Callable +from collections.abc import Callable +from typing import Any __all__ = ["JSONDecoder", "JSONDecodeError"] diff --git a/stdlib/json/encoder.pyi b/stdlib/json/encoder.pyi index 6dd74896e5a0..ecd1fa78ad99 100644 --- a/stdlib/json/encoder.pyi +++ b/stdlib/json/encoder.pyi @@ -1,4 +1,5 @@ -from typing import Any, Callable, Iterator, Pattern +from collections.abc import Callable, Iterator +from typing import Any, Pattern ESCAPE: Pattern[str] ESCAPE_ASCII: Pattern[str] diff --git a/stdlib/keyword.pyi b/stdlib/keyword.pyi index e9a9877d57da..c17c58012fd1 100644 --- a/stdlib/keyword.pyi +++ b/stdlib/keyword.pyi @@ -1,5 +1,5 @@ import sys -from typing import Sequence +from collections.abc import Sequence if sys.version_info >= (3, 9): __all__ = ["iskeyword", "issoftkeyword", "kwlist", "softkwlist"] diff --git a/stdlib/lib2to3/pgen2/driver.pyi b/stdlib/lib2to3/pgen2/driver.pyi index 4ecba031942c..61ec90b4d582 100644 --- a/stdlib/lib2to3/pgen2/driver.pyi +++ b/stdlib/lib2to3/pgen2/driver.pyi @@ -1,8 +1,9 @@ from _typeshed import StrPath +from collections.abc import Iterable from lib2to3.pgen2.grammar import Grammar from lib2to3.pytree import _NL, _Convert from logging import Logger -from typing import IO, Any, Iterable +from typing import IO, Any __all__ = ["Driver", "load_grammar"] diff --git a/stdlib/lib2to3/pgen2/parse.pyi b/stdlib/lib2to3/pgen2/parse.pyi index a30573c8fd43..14d6004d3423 100644 --- a/stdlib/lib2to3/pgen2/parse.pyi +++ b/stdlib/lib2to3/pgen2/parse.pyi @@ -1,6 +1,7 @@ +from collections.abc import Sequence from lib2to3.pgen2.grammar import _DFAS, Grammar from lib2to3.pytree import _NL, _Convert, _RawNode -from typing import Any, Sequence +from typing import Any from typing_extensions import TypeAlias _Context: TypeAlias = Sequence[Any] diff --git a/stdlib/lib2to3/pgen2/pgen.pyi b/stdlib/lib2to3/pgen2/pgen.pyi index 2628e1223fb4..e3ea07432d70 100644 --- a/stdlib/lib2to3/pgen2/pgen.pyi +++ b/stdlib/lib2to3/pgen2/pgen.pyi @@ -1,7 +1,8 @@ from _typeshed import StrPath +from collections.abc import Iterable, Iterator from lib2to3.pgen2 import grammar from lib2to3.pgen2.tokenize import _TokenInfo -from typing import IO, Any, Iterable, Iterator, NoReturn +from typing import IO, Any, NoReturn class PgenGrammar(grammar.Grammar): ... diff --git a/stdlib/lib2to3/pgen2/tokenize.pyi b/stdlib/lib2to3/pgen2/tokenize.pyi index d7e4af44656a..a998ad5fe49e 100644 --- a/stdlib/lib2to3/pgen2/tokenize.pyi +++ b/stdlib/lib2to3/pgen2/tokenize.pyi @@ -1,6 +1,6 @@ import sys +from collections.abc import Callable, Iterable, Iterator from lib2to3.pgen2.token import * -from typing import Callable, Iterable, Iterator from typing_extensions import TypeAlias if sys.version_info >= (3, 8): diff --git a/stdlib/lib2to3/pytree.pyi b/stdlib/lib2to3/pytree.pyi index 62ba2a4b7670..fa0cb9e34f75 100644 --- a/stdlib/lib2to3/pytree.pyi +++ b/stdlib/lib2to3/pytree.pyi @@ -1,6 +1,7 @@ from _typeshed import Self +from collections.abc import Callable, Iterator from lib2to3.pgen2.grammar import Grammar -from typing import Any, Callable, Iterator +from typing import Any from typing_extensions import TypeAlias _NL: TypeAlias = Node | Leaf diff --git a/stdlib/locale.pyi b/stdlib/locale.pyi index e5227beca149..959054e847a8 100644 --- a/stdlib/locale.pyi +++ b/stdlib/locale.pyi @@ -1,5 +1,6 @@ import sys from _typeshed import StrPath +from collections.abc import Callable, Iterable, Mapping __all__ = [ "getlocale", @@ -32,7 +33,7 @@ __all__ = [ # as a type annotation or type alias. from builtins import str as _str from decimal import Decimal -from typing import Any, Callable, Iterable, Mapping +from typing import Any CODESET: int D_T_FMT: int diff --git a/stdlib/logging/config.pyi b/stdlib/logging/config.pyi index 8ee9e7b339b5..f3cc4afffe09 100644 --- a/stdlib/logging/config.pyi +++ b/stdlib/logging/config.pyi @@ -1,9 +1,9 @@ import sys from _typeshed import StrOrBytesPath, StrPath -from collections.abc import Callable +from collections.abc import Callable, Sequence from configparser import RawConfigParser from threading import Thread -from typing import IO, Any, Pattern, Sequence +from typing import IO, Any, Pattern from . import _Level diff --git a/stdlib/lzma.pyi b/stdlib/lzma.pyi index 3a2df81100ba..d4c7977b8d0a 100644 --- a/stdlib/lzma.pyi +++ b/stdlib/lzma.pyi @@ -1,6 +1,7 @@ import io from _typeshed import ReadableBuffer, Self, StrOrBytesPath -from typing import IO, Any, Mapping, Sequence, TextIO, overload +from collections.abc import Mapping, Sequence +from typing import IO, Any, TextIO, overload from typing_extensions import Literal, TypeAlias, final __all__ = [ diff --git a/stdlib/mailbox.pyi b/stdlib/mailbox.pyi index cf75feefaed6..64183cd0b3a4 100644 --- a/stdlib/mailbox.pyi +++ b/stdlib/mailbox.pyi @@ -2,8 +2,9 @@ import email.message import sys from _typeshed import Self, StrOrBytesPath from abc import ABCMeta, abstractmethod +from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence from types import TracebackType -from typing import IO, Any, AnyStr, Callable, Generic, Iterable, Iterator, Mapping, Protocol, Sequence, TypeVar, overload +from typing import IO, Any, AnyStr, Generic, Protocol, TypeVar, overload from typing_extensions import Literal, TypeAlias if sys.version_info >= (3, 9): diff --git a/stdlib/mailcap.pyi b/stdlib/mailcap.pyi index 4fcb4f077170..e1637ad6e7be 100644 --- a/stdlib/mailcap.pyi +++ b/stdlib/mailcap.pyi @@ -1,4 +1,4 @@ -from typing import Mapping, Sequence +from collections.abc import Mapping, Sequence from typing_extensions import TypeAlias _Cap: TypeAlias = dict[str, str | int] diff --git a/stdlib/math.pyi b/stdlib/math.pyi index 79dec031df72..63a2da4da231 100644 --- a/stdlib/math.pyi +++ b/stdlib/math.pyi @@ -1,6 +1,7 @@ import sys from _typeshed import SupportsTrunc -from typing import Iterable, SupportsFloat, overload +from collections.abc import Iterable +from typing import SupportsFloat, overload from typing_extensions import SupportsIndex, TypeAlias if sys.version_info >= (3, 8): diff --git a/stdlib/mimetypes.pyi b/stdlib/mimetypes.pyi index e51b7cdf37bd..c2b6ff20281a 100644 --- a/stdlib/mimetypes.pyi +++ b/stdlib/mimetypes.pyi @@ -1,6 +1,7 @@ import sys from _typeshed import StrPath -from typing import IO, Sequence +from collections.abc import Sequence +from typing import IO __all__ = [ "knownfiles", diff --git a/stdlib/mmap.pyi b/stdlib/mmap.pyi index 744888172479..96bb01a271fc 100644 --- a/stdlib/mmap.pyi +++ b/stdlib/mmap.pyi @@ -1,6 +1,7 @@ import sys from _typeshed import ReadableBuffer, Self -from typing import Iterable, Iterator, NoReturn, Sized, overload +from collections.abc import Iterable, Iterator, Sized +from typing import NoReturn, overload ACCESS_DEFAULT: int ACCESS_READ: int diff --git a/stdlib/modulefinder.pyi b/stdlib/modulefinder.pyi index 9efe032cfd29..cd01e0e1381f 100644 --- a/stdlib/modulefinder.pyi +++ b/stdlib/modulefinder.pyi @@ -1,6 +1,7 @@ import sys +from collections.abc import Container, Iterable, Iterator, Sequence from types import CodeType -from typing import IO, Any, Container, Iterable, Iterator, Sequence +from typing import IO, Any LOAD_CONST: int # undocumented IMPORT_NAME: int # undocumented diff --git a/stdlib/msilib/__init__.pyi b/stdlib/msilib/__init__.pyi index c512489be34d..968efbec7a6c 100644 --- a/stdlib/msilib/__init__.pyi +++ b/stdlib/msilib/__init__.pyi @@ -1,6 +1,7 @@ import sys +from collections.abc import Container, Iterable, Sequence from types import ModuleType -from typing import Any, Container, Iterable, Sequence +from typing import Any from typing_extensions import Literal if sys.platform == "win32": diff --git a/stdlib/multiprocessing/connection.pyi b/stdlib/multiprocessing/connection.pyi index 9b5af6323562..7b227a697abe 100644 --- a/stdlib/multiprocessing/connection.pyi +++ b/stdlib/multiprocessing/connection.pyi @@ -2,7 +2,8 @@ import socket import sys import types from _typeshed import Self -from typing import Any, Iterable, Union +from collections.abc import Iterable +from typing import Any, Union from typing_extensions import SupportsIndex, TypeAlias __all__ = ["Client", "Listener", "Pipe", "wait"] diff --git a/stdlib/multiprocessing/dummy/__init__.pyi b/stdlib/multiprocessing/dummy/__init__.pyi index 48f42999866a..bbddfd16ded7 100644 --- a/stdlib/multiprocessing/dummy/__init__.pyi +++ b/stdlib/multiprocessing/dummy/__init__.pyi @@ -1,8 +1,9 @@ import array import threading import weakref +from collections.abc import Callable, Iterable, Mapping, Sequence from queue import Queue as Queue -from typing import Any, Callable, Iterable, Mapping, Sequence +from typing import Any from typing_extensions import Literal from .connection import Pipe as Pipe diff --git a/stdlib/multiprocessing/managers.pyi b/stdlib/multiprocessing/managers.pyi index a0f76b636c4b..5a779a221f3b 100644 --- a/stdlib/multiprocessing/managers.pyi +++ b/stdlib/multiprocessing/managers.pyi @@ -2,8 +2,9 @@ import queue import sys import threading from _typeshed import Self +from collections.abc import Callable, Iterable, Mapping, Sequence from types import TracebackType -from typing import Any, AnyStr, Callable, Generic, Iterable, Mapping, Sequence, TypeVar +from typing import Any, AnyStr, Generic, TypeVar from .connection import Connection from .context import BaseContext diff --git a/stdlib/multiprocessing/pool.pyi b/stdlib/multiprocessing/pool.pyi index 5e38e0161834..c0d01e98dfae 100644 --- a/stdlib/multiprocessing/pool.pyi +++ b/stdlib/multiprocessing/pool.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import Self +from collections.abc import Callable, Iterable, Iterator, Mapping from types import TracebackType -from typing import Any, Callable, Generic, Iterable, Iterator, Mapping, TypeVar +from typing import Any, Generic, TypeVar from typing_extensions import Literal if sys.version_info >= (3, 9): diff --git a/stdlib/multiprocessing/shared_memory.pyi b/stdlib/multiprocessing/shared_memory.pyi index a4c4fd071c5f..76ccedaf478e 100644 --- a/stdlib/multiprocessing/shared_memory.pyi +++ b/stdlib/multiprocessing/shared_memory.pyi @@ -1,6 +1,7 @@ import sys from _typeshed import Self -from typing import Any, Generic, Iterable, TypeVar +from collections.abc import Iterable +from typing import Any, Generic, TypeVar if sys.version_info >= (3, 9): from types import GenericAlias diff --git a/stdlib/multiprocessing/spawn.pyi b/stdlib/multiprocessing/spawn.pyi index 4f981ea467c4..50570ff3717b 100644 --- a/stdlib/multiprocessing/spawn.pyi +++ b/stdlib/multiprocessing/spawn.pyi @@ -1,5 +1,6 @@ +from collections.abc import Mapping, Sequence from types import ModuleType -from typing import Any, Mapping, Sequence +from typing import Any __all__ = [ "_main", diff --git a/stdlib/multiprocessing/synchronize.pyi b/stdlib/multiprocessing/synchronize.pyi index b96f9429dee2..e93d6c58b5cf 100644 --- a/stdlib/multiprocessing/synchronize.pyi +++ b/stdlib/multiprocessing/synchronize.pyi @@ -1,9 +1,10 @@ import sys import threading +from collections.abc import Callable from contextlib import AbstractContextManager from multiprocessing.context import BaseContext from types import TracebackType -from typing import Any, Callable +from typing import Any from typing_extensions import TypeAlias __all__ = ["Lock", "RLock", "Semaphore", "BoundedSemaphore", "Condition", "Event"] diff --git a/stdlib/nntplib.pyi b/stdlib/nntplib.pyi index 019475294fee..35c706d5eb02 100644 --- a/stdlib/nntplib.pyi +++ b/stdlib/nntplib.pyi @@ -3,7 +3,8 @@ import socket import ssl import sys from _typeshed import Self -from typing import IO, Any, Iterable, NamedTuple +from collections.abc import Iterable +from typing import IO, Any, NamedTuple from typing_extensions import Literal, TypeAlias __all__ = [ diff --git a/stdlib/optparse.pyi b/stdlib/optparse.pyi index 7aedf583e556..1e7428f59a95 100644 --- a/stdlib/optparse.pyi +++ b/stdlib/optparse.pyi @@ -1,5 +1,6 @@ from abc import abstractmethod -from typing import IO, Any, AnyStr, Callable, Iterable, Mapping, Sequence, overload +from collections.abc import Callable, Iterable, Mapping, Sequence +from typing import IO, Any, AnyStr, overload __all__ = [ "Option", diff --git a/stdlib/os/__init__.pyi b/stdlib/os/__init__.pyi index 2048a80efaf5..76c114591d32 100644 --- a/stdlib/os/__init__.pyi +++ b/stdlib/os/__init__.pyi @@ -14,27 +14,11 @@ from _typeshed import ( ) from abc import abstractmethod from builtins import OSError +from collections.abc import Callable, Iterable, Iterator, Mapping, MutableMapping, Sequence from contextlib import AbstractContextManager from io import BufferedRandom, BufferedReader, BufferedWriter, FileIO, TextIOWrapper as _TextIOWrapper from subprocess import Popen -from typing import ( - IO, - Any, - AnyStr, - BinaryIO, - Callable, - Generic, - Iterable, - Iterator, - Mapping, - MutableMapping, - NoReturn, - Protocol, - Sequence, - TypeVar, - overload, - runtime_checkable, -) +from typing import IO, Any, AnyStr, BinaryIO, Generic, NoReturn, Protocol, TypeVar, overload, runtime_checkable from typing_extensions import Final, Literal, TypeAlias, final from . import path as _path diff --git a/stdlib/parser.pyi b/stdlib/parser.pyi index 95e770b57256..cce8594eac58 100644 --- a/stdlib/parser.pyi +++ b/stdlib/parser.pyi @@ -1,6 +1,7 @@ from _typeshed import StrOrBytesPath +from collections.abc import Sequence from types import CodeType -from typing import Any, Sequence +from typing import Any from typing_extensions import final def expr(source: str) -> STType: ... diff --git a/stdlib/pathlib.pyi b/stdlib/pathlib.pyi index 45917ce59f8f..65aead6cb4de 100644 --- a/stdlib/pathlib.pyi +++ b/stdlib/pathlib.pyi @@ -8,10 +8,11 @@ from _typeshed import ( Self, StrPath, ) +from collections.abc import Generator, Sequence from io import BufferedRandom, BufferedReader, BufferedWriter, FileIO, TextIOWrapper from os import PathLike, stat_result from types import TracebackType -from typing import IO, Any, BinaryIO, Generator, Sequence, overload +from typing import IO, Any, BinaryIO, overload from typing_extensions import Literal if sys.version_info >= (3, 9): diff --git a/stdlib/pdb.pyi b/stdlib/pdb.pyi index c1cba5e8d23b..e787b4a4c416 100644 --- a/stdlib/pdb.pyi +++ b/stdlib/pdb.pyi @@ -3,9 +3,10 @@ import sys from _typeshed import Self from bdb import Bdb from cmd import Cmd +from collections.abc import Callable, Iterable, Mapping, Sequence from inspect import _SourceObjectType from types import CodeType, FrameType, TracebackType -from typing import IO, Any, Callable, ClassVar, Iterable, Mapping, Sequence, TypeVar +from typing import IO, Any, ClassVar, TypeVar from typing_extensions import ParamSpec __all__ = ["run", "pm", "Pdb", "runeval", "runctx", "runcall", "set_trace", "post_mortem", "help"] diff --git a/stdlib/pickle.pyi b/stdlib/pickle.pyi index 8ebbb62222dc..1481e435c48d 100644 --- a/stdlib/pickle.pyi +++ b/stdlib/pickle.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, Callable, ClassVar, Iterable, Iterator, Mapping, Protocol, Union +from collections.abc import Callable, Iterable, Iterator, Mapping +from typing import Any, ClassVar, Protocol, Union from typing_extensions import TypeAlias, final if sys.version_info >= (3, 8): diff --git a/stdlib/pickletools.pyi b/stdlib/pickletools.pyi index 9d7dc6f97bd8..c78848464237 100644 --- a/stdlib/pickletools.pyi +++ b/stdlib/pickletools.pyi @@ -1,4 +1,5 @@ -from typing import IO, Any, Callable, Iterator, MutableMapping +from collections.abc import Callable, Iterator, MutableMapping +from typing import IO, Any from typing_extensions import TypeAlias __all__ = ["dis", "genops", "optimize"] diff --git a/stdlib/pkgutil.pyi b/stdlib/pkgutil.pyi index 7c27f6702a7e..5a93a9f86812 100644 --- a/stdlib/pkgutil.pyi +++ b/stdlib/pkgutil.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import SupportsRead +from collections.abc import Callable, Iterable, Iterator from importlib.abc import Loader, MetaPathFinder, PathEntryFinder -from typing import IO, Any, Callable, Iterable, Iterator, NamedTuple, TypeVar +from typing import IO, Any, NamedTuple, TypeVar __all__ = [ "get_importer", diff --git a/stdlib/plistlib.pyi b/stdlib/plistlib.pyi index 67d1611de828..de5fe1b75ca0 100644 --- a/stdlib/plistlib.pyi +++ b/stdlib/plistlib.pyi @@ -1,8 +1,9 @@ import sys from _typeshed import Self +from collections.abc import Mapping, MutableMapping from datetime import datetime from enum import Enum -from typing import IO, Any, Mapping, MutableMapping +from typing import IO, Any if sys.version_info >= (3, 9): __all__ = ["InvalidFileException", "FMT_XML", "FMT_BINARY", "load", "dump", "loads", "dumps", "UID"] diff --git a/stdlib/posixpath.pyi b/stdlib/posixpath.pyi index c72ba8a99bdd..4cec7c770ea3 100644 --- a/stdlib/posixpath.pyi +++ b/stdlib/posixpath.pyi @@ -1,5 +1,6 @@ import sys from _typeshed import BytesPath, StrOrBytesPath, StrPath +from collections.abc import Sequence from genericpath import ( commonprefix as commonprefix, exists as exists, @@ -14,7 +15,7 @@ from genericpath import ( samestat as samestat, ) from os import PathLike -from typing import AnyStr, Sequence, overload +from typing import AnyStr, overload __all__ = [ "normcase", diff --git a/stdlib/profile.pyi b/stdlib/profile.pyi index 6b23dff05a66..4b3f832d3224 100644 --- a/stdlib/profile.pyi +++ b/stdlib/profile.pyi @@ -1,5 +1,6 @@ from _typeshed import Self, StrOrBytesPath -from typing import Any, Callable, TypeVar +from collections.abc import Callable +from typing import Any, TypeVar from typing_extensions import ParamSpec, TypeAlias __all__ = ["run", "runctx", "Profile"] diff --git a/stdlib/pstats.pyi b/stdlib/pstats.pyi index e8d13cf5108a..7868512e5ab9 100644 --- a/stdlib/pstats.pyi +++ b/stdlib/pstats.pyi @@ -1,8 +1,9 @@ import sys from _typeshed import Self, StrOrBytesPath +from collections.abc import Iterable from cProfile import Profile as _cProfile from profile import Profile -from typing import IO, Any, Iterable, overload +from typing import IO, Any, overload from typing_extensions import Literal, TypeAlias if sys.version_info >= (3, 9): diff --git a/stdlib/pty.pyi b/stdlib/pty.pyi index 02f0bc7e9cf8..a6a2d8fabb69 100644 --- a/stdlib/pty.pyi +++ b/stdlib/pty.pyi @@ -1,5 +1,5 @@ import sys -from typing import Callable, Iterable +from collections.abc import Callable, Iterable from typing_extensions import Literal, TypeAlias if sys.platform != "win32": diff --git a/stdlib/pydoc.pyi b/stdlib/pydoc.pyi index d68cea97fa5c..16012cb14e12 100644 --- a/stdlib/pydoc.pyi +++ b/stdlib/pydoc.pyi @@ -1,8 +1,9 @@ from _typeshed import SupportsWrite from abc import abstractmethod +from collections.abc import Callable, Container, Mapping, MutableMapping from reprlib import Repr from types import MethodType, ModuleType, TracebackType -from typing import IO, Any, AnyStr, Callable, Container, Mapping, MutableMapping, NoReturn, TypeVar +from typing import IO, Any, AnyStr, NoReturn, TypeVar from typing_extensions import TypeAlias __all__ = ["help"] diff --git a/stdlib/pyexpat/__init__.pyi b/stdlib/pyexpat/__init__.pyi index f6a5c55cdd63..2fe76a3d61b6 100644 --- a/stdlib/pyexpat/__init__.pyi +++ b/stdlib/pyexpat/__init__.pyi @@ -1,7 +1,8 @@ import pyexpat.errors as errors import pyexpat.model as model from _typeshed import SupportsRead -from typing import Any, Callable +from collections.abc import Callable +from typing import Any from typing_extensions import TypeAlias, final EXPAT_VERSION: str # undocumented diff --git a/stdlib/re.pyi b/stdlib/re.pyi index 42c6fbd10897..ff2a55fb4e61 100644 --- a/stdlib/re.pyi +++ b/stdlib/re.pyi @@ -1,8 +1,9 @@ import enum import sre_compile import sys +from collections.abc import Callable, Iterator from sre_constants import error as error -from typing import Any, AnyStr, Callable, Iterator, overload +from typing import Any, AnyStr, overload from typing_extensions import TypeAlias # ----- re variables and constants ----- diff --git a/stdlib/readline.pyi b/stdlib/readline.pyi index 365caa00a907..ceca2e32f221 100644 --- a/stdlib/readline.pyi +++ b/stdlib/readline.pyi @@ -1,6 +1,6 @@ import sys from _typeshed import StrOrBytesPath -from typing import Callable, Sequence +from collections.abc import Callable, Sequence from typing_extensions import TypeAlias if sys.platform != "win32": diff --git a/stdlib/reprlib.pyi b/stdlib/reprlib.pyi index bef0ddb5354e..d5554344c494 100644 --- a/stdlib/reprlib.pyi +++ b/stdlib/reprlib.pyi @@ -1,6 +1,7 @@ from array import array from collections import deque -from typing import Any, Callable +from collections.abc import Callable +from typing import Any from typing_extensions import TypeAlias __all__ = ["Repr", "repr", "recursive_repr"] diff --git a/stdlib/sched.pyi b/stdlib/sched.pyi index dff781b0c176..709d6f47ff65 100644 --- a/stdlib/sched.pyi +++ b/stdlib/sched.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, Callable, NamedTuple +from collections.abc import Callable +from typing import Any, NamedTuple __all__ = ["scheduler"] diff --git a/stdlib/select.pyi b/stdlib/select.pyi index d4a3656e110e..7cfea9ea0fc1 100644 --- a/stdlib/select.pyi +++ b/stdlib/select.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import FileDescriptorLike, Self +from collections.abc import Iterable from types import TracebackType -from typing import Any, Iterable +from typing import Any from typing_extensions import final if sys.platform != "win32": diff --git a/stdlib/selectors.pyi b/stdlib/selectors.pyi index 23a94a29a74d..9292e8a6822e 100644 --- a/stdlib/selectors.pyi +++ b/stdlib/selectors.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import FileDescriptor, FileDescriptorLike, Self from abc import ABCMeta, abstractmethod -from typing import Any, Mapping, NamedTuple +from collections.abc import Mapping +from typing import Any, NamedTuple _EventMask = int diff --git a/stdlib/shlex.pyi b/stdlib/shlex.pyi index 6385011575a4..fe0f80ba26c1 100644 --- a/stdlib/shlex.pyi +++ b/stdlib/shlex.pyi @@ -1,6 +1,7 @@ import sys from _typeshed import Self -from typing import Iterable, TextIO +from collections.abc import Iterable +from typing import TextIO if sys.version_info >= (3, 8): __all__ = ["shlex", "split", "quote", "join"] diff --git a/stdlib/shutil.pyi b/stdlib/shutil.pyi index 16684ca82804..fe8e8729b123 100644 --- a/stdlib/shutil.pyi +++ b/stdlib/shutil.pyi @@ -1,7 +1,8 @@ import os import sys from _typeshed import BytesPath, StrOrBytesPath, StrPath, SupportsRead, SupportsWrite -from typing import Any, AnyStr, Callable, Iterable, NamedTuple, Sequence, TypeVar, overload +from collections.abc import Callable, Iterable, Sequence +from typing import Any, AnyStr, NamedTuple, TypeVar, overload from typing_extensions import TypeAlias __all__ = [ diff --git a/stdlib/signal.pyi b/stdlib/signal.pyi index 8e45c6a831e2..893d9d45e4b1 100644 --- a/stdlib/signal.pyi +++ b/stdlib/signal.pyi @@ -1,8 +1,9 @@ import sys from _typeshed import structseq +from collections.abc import Callable, Iterable from enum import IntEnum from types import FrameType -from typing import Any, Callable, Iterable, Union +from typing import Any, Union from typing_extensions import Final, TypeAlias, final NSIG: int diff --git a/stdlib/site.pyi b/stdlib/site.pyi index a73d188a7e5c..53199db0eaf3 100644 --- a/stdlib/site.pyi +++ b/stdlib/site.pyi @@ -1,5 +1,5 @@ from _typeshed import StrPath -from typing import Iterable +from collections.abc import Iterable PREFIXES: list[str] ENABLE_USER_SITE: bool | None diff --git a/stdlib/smtplib.pyi b/stdlib/smtplib.pyi index 7967327b15c3..d90c744c504a 100644 --- a/stdlib/smtplib.pyi +++ b/stdlib/smtplib.pyi @@ -1,10 +1,11 @@ import sys from _typeshed import Self +from collections.abc import Sequence from email.message import Message as _Message from socket import socket from ssl import SSLContext from types import TracebackType -from typing import Any, Pattern, Protocol, Sequence, overload +from typing import Any, Pattern, Protocol, overload from typing_extensions import TypeAlias if sys.version_info >= (3, 7): diff --git a/stdlib/socketserver.pyi b/stdlib/socketserver.pyi index d86e0e4e326f..20ff5daa718e 100644 --- a/stdlib/socketserver.pyi +++ b/stdlib/socketserver.pyi @@ -1,8 +1,9 @@ import sys import types from _typeshed import Self +from collections.abc import Callable from socket import socket as _socket -from typing import Any, BinaryIO, Callable, ClassVar, Union +from typing import Any, BinaryIO, ClassVar, Union from typing_extensions import TypeAlias if sys.platform == "win32": diff --git a/stdlib/sre_parse.pyi b/stdlib/sre_parse.pyi index 05ac306fab1f..0958e73f5176 100644 --- a/stdlib/sre_parse.pyi +++ b/stdlib/sre_parse.pyi @@ -1,7 +1,8 @@ import sys +from collections.abc import Iterable from sre_constants import * from sre_constants import _NamedIntConstant as _NIC, error as _Error -from typing import Any, Iterable, Match, Pattern as _Pattern, overload +from typing import Any, Match, Pattern as _Pattern, overload from typing_extensions import TypeAlias SPECIAL_CHARS: str diff --git a/stdlib/ssl.pyi b/stdlib/ssl.pyi index 3ec3abc0bcd6..8445435fa346 100644 --- a/stdlib/ssl.pyi +++ b/stdlib/ssl.pyi @@ -2,7 +2,8 @@ import enum import socket import sys from _typeshed import ReadableBuffer, Self, StrOrBytesPath, WriteableBuffer -from typing import Any, Callable, Iterable, NamedTuple, Union, overload +from collections.abc import Callable, Iterable +from typing import Any, NamedTuple, Union, overload from typing_extensions import Literal, TypeAlias, TypedDict, final _PCTRTT: TypeAlias = tuple[tuple[str, str], ...] diff --git a/stdlib/statistics.pyi b/stdlib/statistics.pyi index 9f31c8f8fb3a..540ccfcaaa8c 100644 --- a/stdlib/statistics.pyi +++ b/stdlib/statistics.pyi @@ -1,8 +1,9 @@ import sys from _typeshed import Self, SupportsRichComparisonT +from collections.abc import Hashable, Iterable, Sequence from decimal import Decimal from fractions import Fraction -from typing import Any, Hashable, Iterable, NamedTuple, Sequence, SupportsFloat, TypeVar +from typing import Any, NamedTuple, SupportsFloat, TypeVar from typing_extensions import Literal, TypeAlias if sys.version_info >= (3, 10): diff --git a/stdlib/string.pyi b/stdlib/string.pyi index 535f38545132..4404bde8bc4f 100644 --- a/stdlib/string.pyi +++ b/stdlib/string.pyi @@ -1,6 +1,7 @@ import sys +from collections.abc import Iterable, Mapping, Sequence from re import RegexFlag -from typing import Any, Iterable, Mapping, Sequence +from typing import Any if sys.version_info >= (3, 8): from re import Pattern diff --git a/stdlib/struct.pyi b/stdlib/struct.pyi index 1f6c45a23c0a..59c66ad2f167 100644 --- a/stdlib/struct.pyi +++ b/stdlib/struct.pyi @@ -1,6 +1,7 @@ import sys from _typeshed import ReadableBuffer, WriteableBuffer -from typing import Any, Iterator +from collections.abc import Iterator +from typing import Any __all__ = ["calcsize", "pack", "pack_into", "unpack", "unpack_from", "iter_unpack", "Struct", "error"] diff --git a/stdlib/subprocess.pyi b/stdlib/subprocess.pyi index 66a3d2d01036..98bbf7d33f90 100644 --- a/stdlib/subprocess.pyi +++ b/stdlib/subprocess.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import Self, StrOrBytesPath +from collections.abc import Callable, Iterable, Mapping, Sequence from types import TracebackType -from typing import IO, Any, AnyStr, Callable, Generic, Iterable, Mapping, Sequence, TypeVar, overload +from typing import IO, Any, AnyStr, Generic, TypeVar, overload from typing_extensions import Literal, TypeAlias if sys.version_info >= (3, 9): diff --git a/stdlib/symtable.pyi b/stdlib/symtable.pyi index 91e95270901e..7a95fe5e445f 100644 --- a/stdlib/symtable.pyi +++ b/stdlib/symtable.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any __all__ = ["symtable", "SymbolTable", "Class", "Function", "Symbol"] diff --git a/stdlib/sys.pyi b/stdlib/sys.pyi index 38e804025c0b..92b806e04420 100644 --- a/stdlib/sys.pyi +++ b/stdlib/sys.pyi @@ -1,11 +1,12 @@ import sys from _typeshed import OptExcInfo, structseq from builtins import object as _object +from collections.abc import AsyncGenerator, Callable, Coroutine, Sequence from importlib.abc import PathEntryFinder from importlib.machinery import ModuleSpec from io import TextIOWrapper from types import FrameType, ModuleType, TracebackType -from typing import Any, AsyncGenerator, Callable, Coroutine, NoReturn, Protocol, Sequence, TextIO, TypeVar, overload +from typing import Any, NoReturn, Protocol, TextIO, TypeVar, overload from typing_extensions import Literal, TypeAlias, final _T = TypeVar("_T") diff --git a/stdlib/tabnanny.pyi b/stdlib/tabnanny.pyi index 020100031c14..8a8592f44124 100644 --- a/stdlib/tabnanny.pyi +++ b/stdlib/tabnanny.pyi @@ -1,5 +1,5 @@ from _typeshed import StrOrBytesPath -from typing import Iterable +from collections.abc import Iterable __all__ = ["check", "NannyNag", "process_tokens"] diff --git a/stdlib/telnetlib.pyi b/stdlib/telnetlib.pyi index 359be6e49781..8edbd155f61c 100644 --- a/stdlib/telnetlib.pyi +++ b/stdlib/telnetlib.pyi @@ -1,7 +1,8 @@ import socket from _typeshed import Self +from collections.abc import Callable, Sequence from types import TracebackType -from typing import Any, Callable, Match, Pattern, Sequence +from typing import Any, Match, Pattern __all__ = ["Telnet"] diff --git a/stdlib/tempfile.pyi b/stdlib/tempfile.pyi index 696294f1acdf..4f2b4a545ff7 100644 --- a/stdlib/tempfile.pyi +++ b/stdlib/tempfile.pyi @@ -1,8 +1,9 @@ import os import sys from _typeshed import Self +from collections.abc import Iterable, Iterator from types import TracebackType -from typing import IO, Any, AnyStr, Generic, Iterable, Iterator, overload +from typing import IO, Any, AnyStr, Generic, overload from typing_extensions import Literal, TypeAlias if sys.version_info >= (3, 9): diff --git a/stdlib/textwrap.pyi b/stdlib/textwrap.pyi index aeb1d87141be..5a61dfedb380 100644 --- a/stdlib/textwrap.pyi +++ b/stdlib/textwrap.pyi @@ -1,4 +1,5 @@ -from typing import Callable, Pattern +from collections.abc import Callable +from typing import Pattern __all__ = ["TextWrapper", "wrap", "fill", "dedent", "indent", "shorten"] diff --git a/stdlib/threading.pyi b/stdlib/threading.pyi index ebdfe5a24e9e..231018ca731a 100644 --- a/stdlib/threading.pyi +++ b/stdlib/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 diff --git a/stdlib/timeit.pyi b/stdlib/timeit.pyi index 9c9d13fb356e..076b2c54f991 100644 --- a/stdlib/timeit.pyi +++ b/stdlib/timeit.pyi @@ -1,4 +1,5 @@ -from typing import IO, Any, Callable, Sequence +from collections.abc import Callable, Sequence +from typing import IO, Any from typing_extensions import TypeAlias __all__ = ["Timer", "timeit", "repeat", "default_timer"] diff --git a/stdlib/tkinter/__init__.pyi b/stdlib/tkinter/__init__.pyi index 6a8737af0a94..66c52107067d 100644 --- a/stdlib/tkinter/__init__.pyi +++ b/stdlib/tkinter/__init__.pyi @@ -1,11 +1,12 @@ import _tkinter import sys from _typeshed import StrOrBytesPath +from collections.abc import Callable, Mapping, Sequence from enum import Enum from tkinter.constants import * from tkinter.font import _FontDescription from types import TracebackType -from typing import Any, Callable, Generic, Mapping, Protocol, Sequence, TypeVar, Union, overload +from typing import Any, Generic, Protocol, TypeVar, Union, overload from typing_extensions import Literal, TypeAlias, TypedDict if sys.version_info >= (3, 9): diff --git a/stdlib/tkinter/commondialog.pyi b/stdlib/tkinter/commondialog.pyi index 1c5fb0f53706..faebcc33955e 100644 --- a/stdlib/tkinter/commondialog.pyi +++ b/stdlib/tkinter/commondialog.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, ClassVar, Mapping +from collections.abc import Mapping +from typing import Any, ClassVar if sys.version_info >= (3, 9): __all__ = ["Dialog"] diff --git a/stdlib/tkinter/dialog.pyi b/stdlib/tkinter/dialog.pyi index f9c8487c44a9..9ced7a208808 100644 --- a/stdlib/tkinter/dialog.pyi +++ b/stdlib/tkinter/dialog.pyi @@ -1,6 +1,7 @@ import sys +from collections.abc import Mapping from tkinter import Widget -from typing import Any, Mapping +from typing import Any if sys.version_info >= (3, 9): __all__ = ["Dialog"] diff --git a/stdlib/tkinter/filedialog.pyi b/stdlib/tkinter/filedialog.pyi index dc0e01a6d1d1..2815289e81c3 100644 --- a/stdlib/tkinter/filedialog.pyi +++ b/stdlib/tkinter/filedialog.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import StrOrBytesPath +from collections.abc import Iterable from tkinter import Button, Entry, Frame, Listbox, Misc, Scrollbar, StringVar, Toplevel, commondialog -from typing import IO, Any, ClassVar, Iterable +from typing import IO, Any, ClassVar from typing_extensions import Literal if sys.version_info >= (3, 9): diff --git a/stdlib/tkinter/ttk.pyi b/stdlib/tkinter/ttk.pyi index cffbb1eb4e7d..7ca8f9b800ce 100644 --- a/stdlib/tkinter/ttk.pyi +++ b/stdlib/tkinter/ttk.pyi @@ -1,8 +1,9 @@ import _tkinter import sys import tkinter +from collections.abc import Callable from tkinter.font import _FontDescription -from typing import Any, Callable, overload +from typing import Any, overload from typing_extensions import Literal, TypeAlias, TypedDict if sys.version_info >= (3, 7): diff --git a/stdlib/tokenize.pyi b/stdlib/tokenize.pyi index 0b4de6186f53..dea83263b550 100644 --- a/stdlib/tokenize.pyi +++ b/stdlib/tokenize.pyi @@ -1,8 +1,9 @@ import sys from _typeshed import StrOrBytesPath from builtins import open as _builtin_open +from collections.abc import Callable, Generator, Iterable, Sequence from token import * -from typing import Any, Callable, Generator, Iterable, NamedTuple, Pattern, Sequence, TextIO +from typing import Any, NamedTuple, Pattern, TextIO from typing_extensions import TypeAlias if sys.version_info >= (3, 10): diff --git a/stdlib/trace.pyi b/stdlib/trace.pyi index 1415bf7bca07..3640cb11a878 100644 --- a/stdlib/trace.pyi +++ b/stdlib/trace.pyi @@ -1,7 +1,8 @@ import sys import types from _typeshed import StrPath -from typing import Any, Callable, Mapping, Sequence, TypeVar +from collections.abc import Callable, Mapping, Sequence +from typing import Any, TypeVar from typing_extensions import ParamSpec, TypeAlias __all__ = ["Trace", "CoverageResults"] diff --git a/stdlib/traceback.pyi b/stdlib/traceback.pyi index b86182447b45..5c4d323a2d9f 100644 --- a/stdlib/traceback.pyi +++ b/stdlib/traceback.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import Self, SupportsWrite +from collections.abc import Generator, Iterable, Iterator, Mapping from types import FrameType, TracebackType -from typing import IO, Any, Generator, Iterable, Iterator, Mapping, overload +from typing import IO, Any, overload from typing_extensions import Literal, TypeAlias __all__ = [ diff --git a/stdlib/tracemalloc.pyi b/stdlib/tracemalloc.pyi index 9dd03c254160..193a4acc7c2d 100644 --- a/stdlib/tracemalloc.pyi +++ b/stdlib/tracemalloc.pyi @@ -1,6 +1,7 @@ import sys from _tracemalloc import * -from typing import Any, Sequence, Union, overload +from collections.abc import Sequence +from typing import Any, Union, overload from typing_extensions import SupportsIndex, TypeAlias def get_object_traceback(obj: object) -> Traceback | None: ... diff --git a/stdlib/turtle.pyi b/stdlib/turtle.pyi index 3022f67fbabf..b8304da42d98 100644 --- a/stdlib/turtle.pyi +++ b/stdlib/turtle.pyi @@ -1,6 +1,7 @@ from _typeshed import Self +from collections.abc import Callable, Sequence from tkinter import Canvas, Frame, Misc, PhotoImage, Scrollbar -from typing import Any, Callable, ClassVar, Sequence, Union, overload +from typing import Any, ClassVar, Union, overload from typing_extensions import TypeAlias __all__ = [ diff --git a/stdlib/types.pyi b/stdlib/types.pyi index 9b2fa1f4a2aa..b2b4e1c74cb8 100644 --- a/stdlib/types.pyi +++ b/stdlib/types.pyi @@ -1,26 +1,21 @@ import sys from _typeshed import SupportsKeysAndGetItem -from importlib.abc import _LoaderProtocol -from importlib.machinery import ModuleSpec -from typing import ( - Any, +from collections.abc import ( AsyncGenerator, Awaitable, Callable, - ClassVar, Coroutine, Generator, - Generic, ItemsView, Iterable, Iterator, KeysView, - Mapping, MutableSequence, - TypeVar, ValuesView, - overload, ) +from importlib.abc import _LoaderProtocol +from importlib.machinery import ModuleSpec +from typing import Any, ClassVar, Generic, Mapping, TypeVar, overload from typing_extensions import Literal, ParamSpec, final if sys.version_info >= (3, 10): diff --git a/stdlib/unittest/async_case.pyi b/stdlib/unittest/async_case.pyi index 0442ec444559..55407ec3f1c8 100644 --- a/stdlib/unittest/async_case.pyi +++ b/stdlib/unittest/async_case.pyi @@ -1,4 +1,4 @@ -from typing import Awaitable, Callable +from collections.abc import Awaitable, Callable from typing_extensions import ParamSpec from .case import TestCase diff --git a/stdlib/unittest/case.pyi b/stdlib/unittest/case.pyi index 87441920fe50..578bd6d6f271 100644 --- a/stdlib/unittest/case.pyi +++ b/stdlib/unittest/case.pyi @@ -3,25 +3,10 @@ import logging import sys import unittest.result from _typeshed import Self -from collections.abc import Set as AbstractSet +from collections.abc import Callable, Container, Iterable, Mapping, Sequence, Set as AbstractSet from contextlib import AbstractContextManager from types import TracebackType -from typing import ( - Any, - AnyStr, - Callable, - ClassVar, - Container, - Generic, - Iterable, - Mapping, - NamedTuple, - NoReturn, - Pattern, - Sequence, - TypeVar, - overload, -) +from typing import Any, AnyStr, ClassVar, Generic, NamedTuple, NoReturn, Pattern, TypeVar, overload from typing_extensions import ParamSpec from warnings import WarningMessage diff --git a/stdlib/unittest/loader.pyi b/stdlib/unittest/loader.pyi index b4ce17064aac..76c60f4803f5 100644 --- a/stdlib/unittest/loader.pyi +++ b/stdlib/unittest/loader.pyi @@ -2,8 +2,9 @@ import sys import unittest.case import unittest.result import unittest.suite +from collections.abc import Callable, Sequence from types import ModuleType -from typing import Any, Callable, Pattern, Sequence +from typing import Any, Pattern from typing_extensions import TypeAlias _SortComparisonMethod: TypeAlias = Callable[[str, str], int] diff --git a/stdlib/unittest/main.pyi b/stdlib/unittest/main.pyi index d3c0ca722f4d..31853676b011 100644 --- a/stdlib/unittest/main.pyi +++ b/stdlib/unittest/main.pyi @@ -3,8 +3,9 @@ import unittest.case import unittest.loader import unittest.result import unittest.suite +from collections.abc import Iterable from types import ModuleType -from typing import Any, Iterable, Protocol +from typing import Any, Protocol MAIN_EXAMPLES: str MODULE_EXAMPLES: str diff --git a/stdlib/unittest/mock.pyi b/stdlib/unittest/mock.pyi index eef114ba6563..b431b52b8b6e 100644 --- a/stdlib/unittest/mock.pyi +++ b/stdlib/unittest/mock.pyi @@ -1,8 +1,9 @@ import sys from _typeshed import Self +from collections.abc import Awaitable, Callable, Iterable, Mapping, Sequence from contextlib import _GeneratorContextManager from types import TracebackType -from typing import Any, Awaitable, Callable, Generic, Iterable, Mapping, Sequence, TypeVar, overload +from typing import Any, Generic, TypeVar, overload from typing_extensions import Literal, TypeAlias _T = TypeVar("_T") diff --git a/stdlib/unittest/result.pyi b/stdlib/unittest/result.pyi index 54d8704bad4f..d30d169fc3f6 100644 --- a/stdlib/unittest/result.pyi +++ b/stdlib/unittest/result.pyi @@ -1,6 +1,7 @@ import unittest.case +from collections.abc import Callable from types import TracebackType -from typing import Any, Callable, TextIO, TypeVar, Union +from typing import Any, TextIO, TypeVar, Union from typing_extensions import TypeAlias _SysExcInfoType: TypeAlias = Union[tuple[type[BaseException], BaseException, TracebackType], tuple[None, None, None]] diff --git a/stdlib/unittest/runner.pyi b/stdlib/unittest/runner.pyi index 6d3c7f0458a1..1f1b89bc1bee 100644 --- a/stdlib/unittest/runner.pyi +++ b/stdlib/unittest/runner.pyi @@ -1,7 +1,8 @@ import unittest.case import unittest.result import unittest.suite -from typing import Callable, Iterable, TextIO +from collections.abc import Callable, Iterable +from typing import TextIO from typing_extensions import TypeAlias _ResultClassType: TypeAlias = Callable[[TextIO, bool, int], unittest.result.TestResult] diff --git a/stdlib/unittest/signals.pyi b/stdlib/unittest/signals.pyi index e6f5f95e1eb1..89e108d926a6 100644 --- a/stdlib/unittest/signals.pyi +++ b/stdlib/unittest/signals.pyi @@ -1,5 +1,6 @@ import unittest.result -from typing import Callable, TypeVar, overload +from collections.abc import Callable +from typing import TypeVar, overload from typing_extensions import ParamSpec _P = ParamSpec("_P") diff --git a/stdlib/unittest/suite.pyi b/stdlib/unittest/suite.pyi index f295a4f27c65..26bef658f1cd 100644 --- a/stdlib/unittest/suite.pyi +++ b/stdlib/unittest/suite.pyi @@ -1,6 +1,6 @@ import unittest.case import unittest.result -from typing import Iterable, Iterator +from collections.abc import Iterable, Iterator from typing_extensions import TypeAlias _TestType: TypeAlias = unittest.case.TestCase | TestSuite diff --git a/stdlib/unittest/util.pyi b/stdlib/unittest/util.pyi index 4a4fdd387852..f62c728760ff 100644 --- a/stdlib/unittest/util.pyi +++ b/stdlib/unittest/util.pyi @@ -1,4 +1,5 @@ -from typing import Any, Sequence, TypeVar +from collections.abc import Sequence +from typing import Any, TypeVar from typing_extensions import TypeAlias _T = TypeVar("_T") diff --git a/stdlib/urllib/parse.pyi b/stdlib/urllib/parse.pyi index c3348880b80b..c6a6836e6e95 100644 --- a/stdlib/urllib/parse.pyi +++ b/stdlib/urllib/parse.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, AnyStr, Callable, Generic, Mapping, NamedTuple, Sequence, overload +from collections.abc import Callable, Mapping, Sequence +from typing import Any, AnyStr, Generic, NamedTuple, overload from typing_extensions import TypeAlias if sys.version_info >= (3, 9): diff --git a/stdlib/urllib/request.pyi b/stdlib/urllib/request.pyi index ae0dfb1f62bc..5e6dde01480a 100644 --- a/stdlib/urllib/request.pyi +++ b/stdlib/urllib/request.pyi @@ -1,10 +1,11 @@ import ssl import sys from _typeshed import StrOrBytesPath, SupportsRead +from collections.abc import Callable, Iterable, Mapping, MutableMapping, Sequence from email.message import Message from http.client import HTTPMessage, HTTPResponse, _HTTPConnectionProtocol from http.cookiejar import CookieJar -from typing import IO, Any, Callable, ClassVar, Iterable, Mapping, MutableMapping, NoReturn, Pattern, Sequence, TypeVar, overload +from typing import IO, Any, ClassVar, NoReturn, Pattern, TypeVar, overload from typing_extensions import TypeAlias from urllib.error import HTTPError from urllib.response import addclosehook, addinfourl diff --git a/stdlib/urllib/response.pyi b/stdlib/urllib/response.pyi index 2efec0d47d44..8c9a600f3c48 100644 --- a/stdlib/urllib/response.pyi +++ b/stdlib/urllib/response.pyi @@ -1,8 +1,9 @@ import sys from _typeshed import Self +from collections.abc import Callable, Iterable from email.message import Message from types import TracebackType -from typing import IO, Any, BinaryIO, Callable, Iterable +from typing import IO, Any, BinaryIO __all__ = ["addbase", "addclosehook", "addinfo", "addinfourl"] diff --git a/stdlib/urllib/robotparser.pyi b/stdlib/urllib/robotparser.pyi index d1d69546db42..795cf83fcecd 100644 --- a/stdlib/urllib/robotparser.pyi +++ b/stdlib/urllib/robotparser.pyi @@ -1,5 +1,6 @@ import sys -from typing import Iterable, NamedTuple +from collections.abc import Iterable +from typing import NamedTuple __all__ = ["RobotFileParser"] diff --git a/stdlib/venv/__init__.pyi b/stdlib/venv/__init__.pyi index 815490a205ab..6afe328ac90d 100644 --- a/stdlib/venv/__init__.pyi +++ b/stdlib/venv/__init__.pyi @@ -1,7 +1,7 @@ +from collections.abc import Sequence import sys from _typeshed import StrOrBytesPath from types import SimpleNamespace -from typing import Sequence if sys.version_info >= (3, 9): CORE_VENV_DEPS: tuple[str, ...] diff --git a/stdlib/warnings.pyi b/stdlib/warnings.pyi index 5bb8341b2ba0..bd7afb2d7cba 100644 --- a/stdlib/warnings.pyi +++ b/stdlib/warnings.pyi @@ -1,6 +1,7 @@ from _warnings import warn as warn, warn_explicit as warn_explicit +from collections.abc import Sequence from types import ModuleType, TracebackType -from typing import Any, Sequence, TextIO, overload +from typing import Any, TextIO, overload from typing_extensions import Literal, TypeAlias __all__ = [ diff --git a/stdlib/weakref.pyi b/stdlib/weakref.pyi index 820488529143..03dd89c8e210 100644 --- a/stdlib/weakref.pyi +++ b/stdlib/weakref.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import Self, SupportsKeysAndGetItem from _weakrefset import WeakSet as WeakSet -from typing import Any, Callable, Generic, Iterable, Iterator, Mapping, MutableMapping, TypeVar, overload +from collections.abc import Callable, Iterable, Iterator, Mapping, MutableMapping +from typing import Any, Generic, TypeVar, overload from typing_extensions import ParamSpec from _weakref import ( diff --git a/stdlib/webbrowser.pyi b/stdlib/webbrowser.pyi index ce8fca262d2d..a5b04a262596 100644 --- a/stdlib/webbrowser.pyi +++ b/stdlib/webbrowser.pyi @@ -1,6 +1,6 @@ import sys from abc import abstractmethod -from typing import Callable, Sequence +from collections.abc import Callable, Sequence from typing_extensions import Literal __all__ = ["Error", "open", "open_new", "open_new_tab", "get", "register"] diff --git a/stdlib/wsgiref/handlers.pyi b/stdlib/wsgiref/handlers.pyi index f180ae756ddb..655fba668598 100644 --- a/stdlib/wsgiref/handlers.pyi +++ b/stdlib/wsgiref/handlers.pyi @@ -1,7 +1,8 @@ from _typeshed import OptExcInfo from _typeshed.wsgi import ErrorStream, InputStream, StartResponse, WSGIApplication, WSGIEnvironment from abc import abstractmethod -from typing import IO, Callable, MutableMapping +from collections.abc import Callable, MutableMapping +from typing import IO from .headers import Headers from .util import FileWrapper diff --git a/stdlib/wsgiref/util.pyi b/stdlib/wsgiref/util.pyi index f764ed5e3343..36e5c1e69676 100644 --- a/stdlib/wsgiref/util.pyi +++ b/stdlib/wsgiref/util.pyi @@ -1,6 +1,7 @@ import sys from _typeshed.wsgi import WSGIEnvironment -from typing import IO, Any, Callable +from collections.abc import Callable +from typing import IO, Any __all__ = ["FileWrapper", "guess_scheme", "application_uri", "request_uri", "shift_path_info", "setup_testing_defaults"] diff --git a/stdlib/wsgiref/validate.pyi b/stdlib/wsgiref/validate.pyi index 35491756c288..ada2283a6af0 100644 --- a/stdlib/wsgiref/validate.pyi +++ b/stdlib/wsgiref/validate.pyi @@ -1,5 +1,6 @@ from _typeshed.wsgi import ErrorStream, InputStream, WSGIApplication -from typing import Any, Callable, Iterable, Iterator, NoReturn +from collections.abc import Callable, Iterable, Iterator +from typing import Any, NoReturn __all__ = ["validator"] diff --git a/stdlib/xdrlib.pyi b/stdlib/xdrlib.pyi index e9716e29014d..e6b78d5542be 100644 --- a/stdlib/xdrlib.pyi +++ b/stdlib/xdrlib.pyi @@ -1,4 +1,5 @@ -from typing import Callable, Sequence, TypeVar +from collections.abc import Callable, Sequence +from typing import TypeVar __all__ = ["Error", "Packer", "Unpacker", "ConversionError"] diff --git a/stdlib/xml/dom/domreg.pyi b/stdlib/xml/dom/domreg.pyi index b9e2dd9eb263..5a276ae5f561 100644 --- a/stdlib/xml/dom/domreg.pyi +++ b/stdlib/xml/dom/domreg.pyi @@ -1,5 +1,5 @@ from _typeshed.xml import DOMImplementation -from typing import Callable, Iterable +from collections.abc import Callable, Iterable well_known_implementations: dict[str, str] registered: dict[str, Callable[[], DOMImplementation]] diff --git a/stdlib/xml/dom/minicompat.pyi b/stdlib/xml/dom/minicompat.pyi index 411401d11ccd..4507b3d98ee7 100644 --- a/stdlib/xml/dom/minicompat.pyi +++ b/stdlib/xml/dom/minicompat.pyi @@ -1,4 +1,5 @@ -from typing import Any, Iterable, TypeVar +from collections.abc import Iterable +from typing import Any, TypeVar __all__ = ["NodeList", "EmptyNodeList", "StringTypes", "defproperty"] diff --git a/stdlib/xml/dom/pulldom.pyi b/stdlib/xml/dom/pulldom.pyi index d228e2de2bdd..07f220ddd347 100644 --- a/stdlib/xml/dom/pulldom.pyi +++ b/stdlib/xml/dom/pulldom.pyi @@ -1,6 +1,7 @@ import sys from _typeshed import SupportsRead -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any from typing_extensions import Literal, TypeAlias from xml.dom.minidom import Document, DOMImplementation, Element, Text from xml.sax.handler import ContentHandler diff --git a/stdlib/xml/etree/ElementInclude.pyi b/stdlib/xml/etree/ElementInclude.pyi index 5cd85cc21753..7bb78d0628ce 100644 --- a/stdlib/xml/etree/ElementInclude.pyi +++ b/stdlib/xml/etree/ElementInclude.pyi @@ -1,5 +1,5 @@ import sys -from typing import Callable +from collections.abc import Callable from xml.etree.ElementTree import Element XINCLUDE: str diff --git a/stdlib/xml/etree/ElementPath.pyi b/stdlib/xml/etree/ElementPath.pyi index 796c704b793e..e5b8223aab34 100644 --- a/stdlib/xml/etree/ElementPath.pyi +++ b/stdlib/xml/etree/ElementPath.pyi @@ -1,4 +1,5 @@ -from typing import Callable, Generator, Pattern, TypeVar +from collections.abc import Callable, Generator +from typing import Pattern, TypeVar from typing_extensions import TypeAlias from xml.etree.ElementTree import Element diff --git a/stdlib/xml/etree/ElementTree.pyi b/stdlib/xml/etree/ElementTree.pyi index f9beb4aff706..414530b0a34c 100644 --- a/stdlib/xml/etree/ElementTree.pyi +++ b/stdlib/xml/etree/ElementTree.pyi @@ -1,19 +1,7 @@ import sys from _typeshed import FileDescriptor, StrOrBytesPath, SupportsRead, SupportsWrite -from typing import ( - Any, - Callable, - Generator, - ItemsView, - Iterable, - Iterator, - KeysView, - Mapping, - MutableSequence, - Sequence, - TypeVar, - overload, -) +from collections.abc import Callable, Generator, ItemsView, Iterable, Iterator, KeysView, Mapping, MutableSequence, Sequence +from typing import Any, TypeVar, overload from typing_extensions import Literal, SupportsIndex, TypeAlias, TypeGuard if sys.version_info >= (3, 9): diff --git a/stdlib/xml/sax/__init__.pyi b/stdlib/xml/sax/__init__.pyi index 418164aa887f..22a2764a699f 100644 --- a/stdlib/xml/sax/__init__.pyi +++ b/stdlib/xml/sax/__init__.pyi @@ -1,6 +1,7 @@ import sys from _typeshed import SupportsRead, _T_co -from typing import Any, Iterable, NoReturn, Protocol +from collections.abc import Iterable +from typing import Any, NoReturn, Protocol from xml.sax.handler import ContentHandler, ErrorHandler from xml.sax.xmlreader import Locator, XMLReader diff --git a/stdlib/xml/sax/saxutils.pyi b/stdlib/xml/sax/saxutils.pyi index c7304f4b5261..1361949d0c3e 100644 --- a/stdlib/xml/sax/saxutils.pyi +++ b/stdlib/xml/sax/saxutils.pyi @@ -1,7 +1,7 @@ from _typeshed import SupportsWrite from codecs import StreamReaderWriter, StreamWriter +from collections.abc import Mapping from io import RawIOBase, TextIOBase -from typing import Mapping from xml.sax import handler, xmlreader def escape(data: str, entities: Mapping[str, str] = ...) -> str: ... diff --git a/stdlib/xml/sax/xmlreader.pyi b/stdlib/xml/sax/xmlreader.pyi index 684e9cef1f42..d7d4db5b0a16 100644 --- a/stdlib/xml/sax/xmlreader.pyi +++ b/stdlib/xml/sax/xmlreader.pyi @@ -1,4 +1,4 @@ -from typing import Mapping +from collections.abc import Mapping class XMLReader: def __init__(self) -> None: ... diff --git a/stdlib/xmlrpc/client.pyi b/stdlib/xmlrpc/client.pyi index 6929eded7192..d4e82d5e40da 100644 --- a/stdlib/xmlrpc/client.pyi +++ b/stdlib/xmlrpc/client.pyi @@ -3,10 +3,11 @@ import http.client import sys import time from _typeshed import Self, SupportsRead, SupportsWrite +from collections.abc import Callable, Iterable, Mapping from datetime import datetime from io import BytesIO from types import TracebackType -from typing import Any, Callable, Iterable, Mapping, Protocol, Union, overload +from typing import Any, Protocol, Union, overload from typing_extensions import Literal, TypeAlias class _SupportsTimeTuple(Protocol): diff --git a/stdlib/xmlrpc/server.pyi b/stdlib/xmlrpc/server.pyi index fd7010aa53e8..371f1821b29d 100644 --- a/stdlib/xmlrpc/server.pyi +++ b/stdlib/xmlrpc/server.pyi @@ -2,8 +2,9 @@ import http.server import pydoc import socketserver import sys +from collections.abc import Callable, Iterable, Mapping from datetime import datetime -from typing import Any, Callable, Iterable, Mapping, Pattern, Protocol +from typing import Any, Pattern, Protocol from typing_extensions import TypeAlias from xmlrpc.client import Fault diff --git a/stdlib/zipapp.pyi b/stdlib/zipapp.pyi index f7a1db3514d3..d42640141620 100644 --- a/stdlib/zipapp.pyi +++ b/stdlib/zipapp.pyi @@ -1,6 +1,7 @@ import sys +from collections.abc import Callable from pathlib import Path -from typing import BinaryIO, Callable +from typing import BinaryIO from typing_extensions import TypeAlias __all__ = ["ZipAppError", "create_archive", "get_interpreter"] diff --git a/stdlib/zipfile.pyi b/stdlib/zipfile.pyi index 6260b1b50a01..d5255b15c3c0 100644 --- a/stdlib/zipfile.pyi +++ b/stdlib/zipfile.pyi @@ -1,9 +1,10 @@ import io import sys from _typeshed import Self, StrOrBytesPath, StrPath +from collections.abc import Callable, Iterable, Iterator, Sequence from os import PathLike from types import TracebackType -from typing import IO, Any, Callable, Iterable, Iterator, Protocol, Sequence, overload +from typing import IO, Any, Protocol, overload from typing_extensions import Literal, TypeAlias if sys.version_info >= (3, 8): diff --git a/stdlib/zoneinfo/__init__.pyi b/stdlib/zoneinfo/__init__.pyi index d766eab6b7ef..0e898cb29740 100644 --- a/stdlib/zoneinfo/__init__.pyi +++ b/stdlib/zoneinfo/__init__.pyi @@ -1,6 +1,7 @@ from _typeshed import Self, StrPath +from collections.abc import Iterable, Sequence from datetime import tzinfo -from typing import Any, Iterable, Protocol, Sequence +from typing import Any, Protocol __all__ = ["ZoneInfo", "reset_tzpath", "available_timezones", "TZPATH", "ZoneInfoNotFoundError", "InvalidTZPathWarning"]