From 97a74bc1aab4b18827a8861dfc310c96cc52ad55 Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Mon, 18 Apr 2022 11:50:37 +0100 Subject: [PATCH] Import from `collections.abc` wherever possible (#7635) --- stdlib/_bisect.pyi | 3 ++- stdlib/_codecs.pyi | 3 ++- stdlib/_compression.pyi | 3 ++- stdlib/_csv.pyi | 3 ++- stdlib/_decimal.pyi | 3 ++- stdlib/_dummy_thread.pyi | 3 ++- stdlib/_dummy_threading.pyi | 3 ++- stdlib/_json.pyi | 3 ++- stdlib/_operator.pyi | 18 ++------------ stdlib/_osx_support.pyi | 3 ++- stdlib/_posixsubprocess.pyi | 2 +- stdlib/_sitebuiltins.pyi | 3 ++- stdlib/_thread.pyi | 3 ++- stdlib/_tracemalloc.pyi | 2 +- stdlib/_typeshed/__init__.pyi | 3 ++- stdlib/_typeshed/wsgi.pyi | 3 ++- stdlib/_weakref.pyi | 3 ++- stdlib/_weakrefset.pyi | 3 ++- stdlib/_winapi.pyi | 3 ++- stdlib/argparse.pyi | 17 ++----------- stdlib/array.pyi | 3 ++- stdlib/ast.pyi | 3 ++- stdlib/asyncio/base_events.pyi | 4 +-- stdlib/asyncio/base_futures.pyi | 3 ++- stdlib/asyncio/base_subprocess.pyi | 3 ++- stdlib/asyncio/events.pyi | 3 ++- stdlib/asyncio/format_helpers.pyi | 3 ++- stdlib/asyncio/futures.pyi | 3 ++- stdlib/asyncio/locks.pyi | 3 ++- stdlib/asyncio/proactor_events.pyi | 3 ++- stdlib/asyncio/runners.pyi | 3 ++- stdlib/asyncio/sslproto.pyi | 3 ++- stdlib/asyncio/staggered.pyi | 3 ++- stdlib/asyncio/streams.pyi | 3 ++- stdlib/asyncio/subprocess.pyi | 3 ++- stdlib/asyncio/taskgroups.pyi | 3 ++- stdlib/asyncio/tasks.pyi | 4 +-- stdlib/asyncio/threads.pyi | 3 ++- stdlib/asyncio/transports.pyi | 3 ++- stdlib/asyncio/trsock.pyi | 3 ++- stdlib/asyncio/unix_events.pyi | 3 ++- stdlib/asyncio/windows_events.pyi | 3 ++- stdlib/asyncio/windows_utils.pyi | 3 ++- stdlib/atexit.pyi | 3 ++- stdlib/bdb.pyi | 3 ++- stdlib/builtins.pyi | 30 ++++++++++++----------- stdlib/bz2.pyi | 3 ++- stdlib/cProfile.pyi | 3 ++- stdlib/cgitb.pyi | 3 ++- stdlib/cmd.pyi | 3 ++- stdlib/code.pyi | 3 ++- stdlib/codecs.pyi | 3 ++- stdlib/concurrent/futures/_base.pyi | 4 +-- stdlib/concurrent/futures/process.pyi | 4 +-- stdlib/concurrent/futures/thread.pyi | 4 +-- stdlib/contextlib.pyi | 17 ++----------- stdlib/contextvars.pyi | 3 ++- stdlib/copyreg.pyi | 3 ++- stdlib/ctypes/__init__.pyi | 3 ++- stdlib/curses/__init__.pyi | 3 ++- stdlib/curses/textpad.pyi | 2 +- stdlib/dataclasses.pyi | 3 ++- stdlib/dbm/__init__.pyi | 2 +- stdlib/dbm/dumb.pyi | 2 +- stdlib/difflib.pyi | 3 ++- stdlib/dis.pyi | 3 ++- stdlib/distutils/ccompiler.pyi | 3 ++- stdlib/distutils/cmd.pyi | 3 ++- stdlib/distutils/core.pyi | 3 ++- stdlib/distutils/dist.pyi | 3 ++- stdlib/distutils/fancy_getopt.pyi | 3 ++- stdlib/distutils/file_util.pyi | 2 +- stdlib/distutils/filelist.pyi | 3 ++- stdlib/distutils/sysconfig.pyi | 2 +- stdlib/doctest.pyi | 3 ++- stdlib/email/__init__.pyi | 3 ++- stdlib/email/_header_value_parser.pyi | 3 ++- stdlib/email/charset.pyi | 2 +- stdlib/email/contentmanager.pyi | 3 ++- stdlib/email/feedparser.pyi | 3 ++- stdlib/email/iterators.pyi | 2 +- stdlib/email/message.pyi | 3 ++- stdlib/email/parser.pyi | 3 ++- stdlib/email/policy.pyi | 3 ++- stdlib/errno.pyi | 2 +- stdlib/filecmp.pyi | 3 ++- stdlib/fileinput.pyi | 3 ++- stdlib/fnmatch.pyi | 3 ++- stdlib/formatter.pyi | 3 ++- stdlib/ftplib.pyi | 3 ++- stdlib/functools.pyi | 3 ++- stdlib/gc.pyi | 3 ++- stdlib/genericpath.pyi | 3 ++- stdlib/glob.pyi | 3 ++- stdlib/graphlib.pyi | 3 ++- stdlib/hashlib.pyi | 2 +- stdlib/heapq.pyi | 3 ++- stdlib/hmac.pyi | 3 ++- stdlib/http/client.pyi | 3 ++- stdlib/http/cookiejar.pyi | 3 ++- stdlib/http/cookies.pyi | 3 ++- stdlib/http/server.pyi | 3 ++- stdlib/imaplib.pyi | 3 ++- stdlib/imghdr.pyi | 3 ++- stdlib/importlib/__init__.pyi | 2 +- stdlib/importlib/abc.pyi | 3 ++- stdlib/importlib/machinery.pyi | 3 ++- stdlib/importlib/metadata/__init__.pyi | 4 +-- stdlib/importlib/metadata/_meta.pyi | 3 ++- stdlib/importlib/resources.pyi | 3 ++- stdlib/importlib/util.pyi | 3 ++- stdlib/inspect.pyi | 4 +-- stdlib/io.pyi | 3 ++- stdlib/ipaddress.pyi | 3 ++- stdlib/itertools.pyi | 3 ++- stdlib/json/__init__.pyi | 3 ++- stdlib/json/decoder.pyi | 3 ++- stdlib/json/encoder.pyi | 3 ++- stdlib/keyword.pyi | 2 +- stdlib/lib2to3/pgen2/driver.pyi | 3 ++- stdlib/lib2to3/pgen2/parse.pyi | 3 ++- stdlib/lib2to3/pgen2/pgen.pyi | 3 ++- stdlib/lib2to3/pgen2/tokenize.pyi | 2 +- stdlib/lib2to3/pytree.pyi | 3 ++- stdlib/locale.pyi | 3 ++- stdlib/logging/config.pyi | 4 +-- stdlib/lzma.pyi | 3 ++- stdlib/mailbox.pyi | 3 ++- stdlib/mailcap.pyi | 2 +- stdlib/math.pyi | 3 ++- stdlib/mimetypes.pyi | 3 ++- stdlib/mmap.pyi | 3 ++- stdlib/modulefinder.pyi | 3 ++- stdlib/msilib/__init__.pyi | 3 ++- stdlib/multiprocessing/connection.pyi | 3 ++- stdlib/multiprocessing/dummy/__init__.pyi | 3 ++- stdlib/multiprocessing/managers.pyi | 3 ++- stdlib/multiprocessing/pool.pyi | 3 ++- stdlib/multiprocessing/shared_memory.pyi | 3 ++- stdlib/multiprocessing/spawn.pyi | 3 ++- stdlib/multiprocessing/synchronize.pyi | 3 ++- stdlib/nntplib.pyi | 3 ++- stdlib/optparse.pyi | 3 ++- stdlib/os/__init__.pyi | 20 ++------------- stdlib/parser.pyi | 3 ++- stdlib/pathlib.pyi | 3 ++- stdlib/pdb.pyi | 3 ++- stdlib/pickle.pyi | 3 ++- stdlib/pickletools.pyi | 3 ++- stdlib/pkgutil.pyi | 3 ++- stdlib/plistlib.pyi | 3 ++- stdlib/posixpath.pyi | 3 ++- stdlib/profile.pyi | 3 ++- stdlib/pstats.pyi | 3 ++- stdlib/pty.pyi | 2 +- stdlib/pydoc.pyi | 3 ++- stdlib/pyexpat/__init__.pyi | 3 ++- stdlib/re.pyi | 3 ++- stdlib/readline.pyi | 2 +- stdlib/reprlib.pyi | 3 ++- stdlib/sched.pyi | 3 ++- stdlib/select.pyi | 3 ++- stdlib/selectors.pyi | 3 ++- stdlib/shlex.pyi | 3 ++- stdlib/shutil.pyi | 3 ++- stdlib/signal.pyi | 3 ++- stdlib/site.pyi | 2 +- stdlib/smtplib.pyi | 3 ++- stdlib/socketserver.pyi | 3 ++- stdlib/sre_parse.pyi | 3 ++- stdlib/ssl.pyi | 3 ++- stdlib/statistics.pyi | 3 ++- stdlib/string.pyi | 3 ++- stdlib/struct.pyi | 3 ++- stdlib/subprocess.pyi | 3 ++- stdlib/symtable.pyi | 3 ++- stdlib/sys.pyi | 3 ++- stdlib/tabnanny.pyi | 2 +- stdlib/telnetlib.pyi | 3 ++- stdlib/tempfile.pyi | 3 ++- stdlib/textwrap.pyi | 3 ++- stdlib/threading.pyi | 3 ++- stdlib/timeit.pyi | 3 ++- stdlib/tkinter/__init__.pyi | 3 ++- stdlib/tkinter/commondialog.pyi | 3 ++- stdlib/tkinter/dialog.pyi | 3 ++- stdlib/tkinter/filedialog.pyi | 3 ++- stdlib/tkinter/ttk.pyi | 3 ++- stdlib/tokenize.pyi | 3 ++- stdlib/trace.pyi | 3 ++- stdlib/traceback.pyi | 3 ++- stdlib/tracemalloc.pyi | 3 ++- stdlib/turtle.pyi | 3 ++- stdlib/types.pyi | 13 +++------- stdlib/unittest/async_case.pyi | 2 +- stdlib/unittest/case.pyi | 19 ++------------ stdlib/unittest/loader.pyi | 3 ++- stdlib/unittest/main.pyi | 3 ++- stdlib/unittest/mock.pyi | 3 ++- stdlib/unittest/result.pyi | 3 ++- stdlib/unittest/runner.pyi | 3 ++- stdlib/unittest/signals.pyi | 3 ++- stdlib/unittest/suite.pyi | 2 +- stdlib/unittest/util.pyi | 3 ++- stdlib/urllib/parse.pyi | 3 ++- stdlib/urllib/request.pyi | 3 ++- stdlib/urllib/response.pyi | 3 ++- stdlib/urllib/robotparser.pyi | 3 ++- stdlib/venv/__init__.pyi | 2 +- stdlib/warnings.pyi | 3 ++- stdlib/weakref.pyi | 3 ++- stdlib/webbrowser.pyi | 2 +- stdlib/wsgiref/handlers.pyi | 3 ++- stdlib/wsgiref/util.pyi | 3 ++- stdlib/wsgiref/validate.pyi | 3 ++- stdlib/xdrlib.pyi | 3 ++- stdlib/xml/dom/domreg.pyi | 2 +- stdlib/xml/dom/minicompat.pyi | 3 ++- stdlib/xml/dom/pulldom.pyi | 3 ++- stdlib/xml/etree/ElementInclude.pyi | 2 +- stdlib/xml/etree/ElementPath.pyi | 3 ++- stdlib/xml/etree/ElementTree.pyi | 16 ++---------- stdlib/xml/sax/__init__.pyi | 3 ++- stdlib/xml/sax/saxutils.pyi | 2 +- stdlib/xml/sax/xmlreader.pyi | 2 +- stdlib/xmlrpc/client.pyi | 3 ++- stdlib/xmlrpc/server.pyi | 3 ++- stdlib/zipapp.pyi | 3 ++- stdlib/zipfile.pyi | 3 ++- stdlib/zoneinfo/__init__.pyi | 3 ++- 230 files changed, 449 insertions(+), 348 deletions(-) diff --git a/stdlib/_bisect.pyi b/stdlib/_bisect.pyi index 5608094cc..d902e1eea 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 e0fe26cf1..e335f6d51 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 e71f7d14b..ec3c7fe70 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 c89571031..ae9031df6 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 a0a9700db..fdeca8f7c 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 97ba17ae4..f257b758e 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 3810f9fe7..2daceaedd 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 962fa9ec2..130f7ab92 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 57f69b598..92e04d0f4 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 cb43fa93b..7fd0ee922 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 5481100ca..2d221c489 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 a71364b8d..4a35921e1 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 04abf8dc8..c5da8ccf3 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 fd159dc58..6e3c4e59a 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 0ccb3f8bf..a80ea0702 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 aafabf6ad..81ca12910 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 0a84f6926..2d3faec1f 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 b0c22a5ec..382dbdeb6 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 1e8c51477..77e771445 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 0a56aa4f4..0f933e58d 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 b3d1a5a85..f0cb64cef 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 3804287c7..199e4f2ac 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 9eda1ad19..7742651fe 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 1b7fe4671..8a973d161 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 e0eaffcaf..963cfa93d 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 10dbad98e..ae5662341 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 63d8c55f4..4e2ef8d3f 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 2b0b93a09..692d263f6 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 01b1c5b45..2758e0c46 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 4ffb40160..21247401c 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 7e799dd22..32cd839f2 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 4ecd7a11d..619e329bf 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 fc4bfad76..610d6f70b 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 55bd7dbdb..77b9c9402 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 7129309de..55093a3eb 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 ef04614c3..58e3d41e5 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 e430f9647..4a8e565af 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 ac3a5c56b..88c4fddca 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 90e54b547..a8cd753c2 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 d9bf3183b..20df2a78a 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 78d87dc4e..ca28ee041 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 1e4d28638..d33210bc1 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 1156f9056..0a79635b3 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 ba0c7dfaf..095ab5f9b 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 5f463ead2..bbd0f20af 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 5db5de3db..e4dd03f14 100644 --- a/stdlib/builtins.pyi +++ b/stdlib/builtins.pyi @@ -22,29 +22,31 @@ from _typeshed import ( SupportsTrunc, SupportsWrite, ) -from collections.abc import Callable -from io import BufferedRandom, BufferedReader, BufferedWriter, FileIO, TextIOWrapper -from types import CodeType, TracebackType, _Cell -from typing import ( - IO, - AbstractSet, - Any, +from collections.abc import ( Awaitable, - BinaryIO, - ByteString, - ClassVar, - Generic, + Callable, Iterable, Iterator, Mapping, MutableMapping, - MutableSequence, MutableSet, + Reversible, + Set as AbstractSet, + Sized, +) +from io import BufferedRandom, BufferedReader, BufferedWriter, FileIO, TextIOWrapper +from types import CodeType, TracebackType, _Cell +from typing import ( + IO, + Any, + BinaryIO, + ByteString, + ClassVar, + Generic, + MutableSequence, NoReturn, Protocol, - Reversible, Sequence, - Sized, SupportsAbs, SupportsBytes, SupportsComplex, diff --git a/stdlib/bz2.pyi b/stdlib/bz2.pyi index a17f9c434..cea317e28 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 7ee7d1bdd..6e21fc92a 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 6c56e897e..ea5a8341b 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 d1166db0f..ddefff2ed 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 185c15853..59318aa35 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 da9c3766b..bba7703c7 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 4967d01f9..5b756d87d 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 0c6c40394..4cfa82768 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 46ca681c5..e10254531 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 2b2c6b55d..c93eeac3b 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 6b5661dd6..341cd8491 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 a570b1fe6..4403550b5 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 6df04a024..53a382ec0 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 ee74c13b6..f80ed442e 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 b8a9c843f..ad9983431 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 d82e9a2bb..f58c6f9f1 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 b80d0ce75..9e99f0d5e 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 70798f907..4fd199f19 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 a57243015..87e376803 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 ff8f4fa91..9a99d4498 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 89ec0e91d..ed823f7c0 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 96a048c93..8163ae78f 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 6564c9a86..199a4d70a 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 c5b3afe7c..ef47e4e4d 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 d8869d94b..6a7124bd1 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 a7f24105a..b3127841b 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 2b436938f..361cb13f0 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 3f579be40..bf7db9c8f 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 47c34ccb1..c767436c2 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 5eac7bf89..8c3e8201d 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 749b6454a..abe6ec63a 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 fd3de9cea..236908537 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 68fe99c8c..3ac665eaa 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 b1c7e0f7d..33da0aa3c 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 ad5517712..29068819a 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 d310c21df..a67651f77 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 bd1e48797..a19f1bae7 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 d4ebb1fd5..4df3c1e48 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 12410af23..9ef1fe6e7 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 7c606af40..a6747dd50 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 a3b62948c..0ef8c14dd 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 8351fce59..7051c999c 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 d4f43de31..0aac0a5f9 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 4a5dad0dd..925ad5884 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 4fd25e634..6681b8c7f 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 9a06e3e4c..98b92e109 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 3abedda26..984d0c3cf 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 ced0ceceb..c63563d19 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 cae2a07e9..2fca402bf 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 4332153d2..79c843fd4 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 a7a787d44..f07afc7af 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 df180f783..858e46a71 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 c8090af3e..235b6d6b4 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 4fb1c38c6..83da7faaf 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 774b45e50..e5aa2c160 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 53159b65e..ad314cec1 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 b29529277..eef1c1957 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 af046e899..5f439779a 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 0e9978677..42401a00b 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 e020b9e9c..63fd02f7b 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 f15ac48af..09abdc6f3 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 52c5547a6..1f32f0770 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 a5e573339..a1101df0d 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 4ff941733..04d7e8dcc 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 c759d7def..2546c2c78 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 680405ea1..b549d6e96 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 ef4789251..327fd0d94 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 c0b3c9674..1fdc6c57d 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 35884bc30..3648d0ce4 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 8e1a36756..2fd87622e 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 866836758..2060cf17d 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 6dd74896e..ecd1fa78a 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 e9a9877d5..c17c58012 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 4ecba0319..61ec90b4d 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 a30573c8f..14d6004d3 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 2628e1223..e3ea07432 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 d7e4af446..a998ad5fe 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 62ba2a4b7..fa0cb9e34 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 e5227beca..959054e84 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 8ee9e7b33..f3cc4afff 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 3a2df8110..d4c7977b8 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 cf75feefa..64183cd0b 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 4fcb4f077..e1637ad6e 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 79dec031d..63a2da4da 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 e51b7cdf3..c2b6ff202 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 744888172..96bb01a27 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 9efe032cf..cd01e0e13 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 c512489be..968efbec7 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 9b5af6323..7b227a697 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 48f429998..bbddfd16d 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 a0f76b636..5a779a221 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 5e38e0161..c0d01e98d 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 a4c4fd071..76ccedaf4 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 4f981ea46..50570ff37 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 b96f9429d..e93d6c58b 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 019475294..35c706d5e 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 7aedf583e..1e7428f59 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 2048a80ef..76c114591 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 95e770b57..cce8594ea 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 45917ce59..65aead6cb 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 c1cba5e8d..e787b4a4c 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 8ebbb6222..1481e435c 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 9d7dc6f97..c78848464 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 7c27f6702..5a93a9f86 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 67d1611de..de5fe1b75 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 c72ba8a99..4cec7c770 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 6b23dff05..4b3f832d3 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 e8d13cf51..7868512e5 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 02f0bc7e9..a6a2d8fab 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 d68cea97f..16012cb14 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 f6a5c55cd..2fe76a3d6 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 42c6fbd10..ff2a55fb4 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 365caa00a..ceca2e32f 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 bef0ddb53..d5554344c 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 dff781b0c..709d6f47f 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 d4a3656e1..7cfea9ea0 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 23a94a29a..9292e8a68 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 638501157..fe0f80ba2 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 16684ca82..fe8e8729b 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 8e45c6a83..893d9d45e 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 a73d188a7..53199db0e 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 7967327b1..d90c744c5 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 d86e0e4e3..20ff5daa7 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 05ac306fa..0958e73f5 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 3ec3abc0b..8445435fa 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 9f31c8f8f..540ccfcaa 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 535f38545..4404bde8b 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 1f6c45a23..59c66ad2f 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 66a3d2d01..98bbf7d33 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 91e952709..7a95fe5e4 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 38e804025..92b806e04 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 020100031..8a8592f44 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 359be6e49..8edbd155f 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 696294f1a..4f2b4a545 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 aeb1d8714..5a61dfedb 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 ebdfe5a24..231018ca7 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 9c9d13fb3..076b2c54f 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 6a8737af0..66c521070 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 1c5fb0f53..faebcc339 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 f9c8487c4..9ced7a208 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 dc0e01a6d..2815289e8 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 cffbb1eb4..7ca8f9b80 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 0b4de6186..dea83263b 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 1415bf7bc..3640cb11a 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 b86182447..5c4d323a2 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 9dd03c254..193a4acc7 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 3022f67fb..b8304da42 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 9b2fa1f4a..b2b4e1c74 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 0442ec444..55407ec3f 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 87441920f..578bd6d6f 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 b4ce17064..76c60f480 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 d3c0ca722..31853676b 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 eef114ba6..b431b52b8 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 54d8704ba..d30d169fc 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 6d3c7f045..1f1b89bc1 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 e6f5f95e1..89e108d92 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 f295a4f27..26bef658f 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 4a4fdd387..f62c72876 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 c3348880b..c6a6836e6 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 ae0dfb1f6..5e6dde014 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 2efec0d47..8c9a600f3 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 d1d69546d..795cf83fc 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 815490a20..6afe328ac 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 5bb8341b2..bd7afb2d7 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 820488529..03dd89c8e 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 ce8fca262..a5b04a262 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 f180ae756..655fba668 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 f764ed5e3..36e5c1e69 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 35491756c..ada2283a6 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 e9716e290..e6b78d554 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 b9e2dd9eb..5a276ae5f 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 411401d11..4507b3d98 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 d228e2de2..07f220ddd 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 5cd85cc21..7bb78d062 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 796c704b7..e5b8223aa 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 f9beb4aff..414530b0a 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 418164aa8..22a2764a6 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 c7304f4b5..1361949d0 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 684e9cef1..d7d4db5b0 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 6929eded7..d4e82d5e4 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 fd7010aa5..371f1821b 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 f7a1db351..d42640141 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 6260b1b50..d5255b15c 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 d766eab6b..0e898cb29 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"]