From 653f2c6ba4273618d4f0292b35938abb97cc42ed Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Sat, 16 Apr 2022 14:52:57 +0100 Subject: [PATCH] Third-party stubs: import from `collections.abc` where possible (#7637) --- stubs/DateTimeRange/datetimerange/__init__.pyi | 2 +- stubs/Flask-Cors/flask_cors/core.pyi | 3 ++- stubs/Flask-Cors/flask_cors/decorator.pyi | 3 ++- stubs/Flask-Cors/flask_cors/extension.pyi | 3 ++- stubs/JACK-Client/jack/__init__.pyi | 3 ++- stubs/Markdown/markdown/blockparser.pyi | 3 ++- stubs/Markdown/markdown/core.pyi | 3 ++- stubs/Markdown/markdown/extensions/__init__.pyi | 3 ++- stubs/Pillow/PIL/ExifTags.pyi | 2 +- stubs/Pillow/PIL/Image.pyi | 4 ++-- stubs/Pillow/PIL/ImageDraw.pyi | 4 ++-- stubs/Pillow/PIL/ImageFilter.pyi | 3 ++- stubs/Pillow/PIL/ImageOps.pyi | 3 ++- stubs/PyMySQL/pymysql/connections.pyi | 3 ++- stubs/PyMySQL/pymysql/cursors.pyi | 3 ++- stubs/Pygments/pygments/formatters/__init__.pyi | 3 ++- stubs/Pygments/pygments/plugin.pyi | 3 ++- stubs/SQLAlchemy/sqlalchemy/engine/base.pyi | 4 ++-- stubs/aiofiles/aiofiles/base.pyi | 3 ++- stubs/aiofiles/aiofiles/os.pyi | 3 ++- stubs/aiofiles/aiofiles/threadpool/__init__.pyi | 3 ++- stubs/aiofiles/aiofiles/threadpool/binary.pyi | 2 +- stubs/aiofiles/aiofiles/threadpool/text.pyi | 3 ++- stubs/aws-xray-sdk/aws_xray_sdk/core/patcher.pyi | 3 ++- stubs/aws-xray-sdk/aws_xray_sdk/core/recorder.pyi | 3 ++- stubs/beautifulsoup4/bs4/__init__.pyi | 3 ++- stubs/beautifulsoup4/bs4/element.pyi | 4 ++-- stubs/beautifulsoup4/bs4/formatter.pyi | 2 +- stubs/boto/boto/kms/layer1.pyi | 3 ++- stubs/boto/boto/s3/bucketlistresultset.pyi | 3 ++- stubs/boto/boto/s3/key.pyi | 3 ++- stubs/boto/boto/utils.pyi | 3 ++- stubs/cachetools/cachetools/__init__.pyi | 4 ++-- stubs/cachetools/cachetools/func.pyi | 3 ++- stubs/cachetools/cachetools/keys.pyi | 2 +- stubs/chevron/chevron/renderer.pyi | 3 ++- stubs/chevron/chevron/tokenizer.pyi | 2 +- stubs/contextvars/contextvars.pyi | 3 ++- .../cryptography/hazmat/primitives/serialization/pkcs7.pyi | 3 ++- stubs/cryptography/cryptography/x509/__init__.pyi | 3 ++- stubs/dataclasses/dataclasses.pyi | 3 ++- stubs/dateparser/dateparser/languages/loader.pyi | 3 ++- stubs/dateparser/dateparser/utils/__init__.pyi | 3 ++- stubs/decorator/decorator.pyi | 3 ++- stubs/docutils/docutils/parsers/rst/roles.pyi | 3 ++- stubs/editdistance/editdistance.pyi | 2 +- stubs/flake8-2020/flake8_2020.pyi | 3 ++- stubs/flake8-bugbear/bugbear.pyi | 3 ++- stubs/flake8-builtins/flake8_builtins.pyi | 3 ++- stubs/flake8-docstrings/flake8_docstrings.pyi | 3 ++- stubs/flake8-plugin-utils/flake8_plugin_utils/plugin.pyi | 3 ++- stubs/flake8-rst-docstrings/flake8_rst_docstrings.pyi | 4 ++-- stubs/flake8-simplify/flake8_simplify/__init__.pyi | 3 ++- stubs/flake8-typing-imports/flake8_typing_imports.pyi | 3 ++- stubs/frozendict/frozendict.pyi | 3 ++- stubs/google-cloud-ndb/google/cloud/ndb/context.pyi | 3 ++- stubs/google-cloud-ndb/google/cloud/ndb/model.pyi | 4 ++-- stubs/hdbcli/hdbcli/dbapi.pyi | 3 ++- stubs/invoke/invoke/completion/complete.pyi | 3 ++- stubs/invoke/invoke/executor.pyi | 3 ++- stubs/invoke/invoke/util.pyi | 3 ++- stubs/invoke/invoke/watchers.pyi | 2 +- stubs/jsonschema/jsonschema/_format.pyi | 3 ++- stubs/jsonschema/jsonschema/_legacy_validators.pyi | 3 ++- stubs/jsonschema/jsonschema/_types.pyi | 2 +- stubs/jsonschema/jsonschema/_utils.pyi | 3 ++- stubs/jsonschema/jsonschema/protocols.pyi | 3 ++- stubs/jsonschema/jsonschema/validators.pyi | 4 ++-- stubs/opentracing/opentracing/harness/scope_check.pyi | 3 ++- stubs/paramiko/paramiko/auth_handler.pyi | 2 +- stubs/paramiko/paramiko/ber.pyi | 3 ++- stubs/paramiko/paramiko/channel.pyi | 3 ++- stubs/paramiko/paramiko/client.pyi | 3 ++- stubs/paramiko/paramiko/config.pyi | 3 ++- stubs/paramiko/paramiko/dsskey.pyi | 3 ++- stubs/paramiko/paramiko/ecdsakey.pyi | 3 ++- stubs/paramiko/paramiko/file.pyi | 3 ++- stubs/paramiko/paramiko/hostkeys.pyi | 2 +- stubs/paramiko/paramiko/kex_curve25519.pyi | 2 +- stubs/paramiko/paramiko/kex_ecdh_nist.pyi | 2 +- stubs/paramiko/paramiko/kex_gex.pyi | 2 +- stubs/paramiko/paramiko/kex_group1.pyi | 2 +- stubs/paramiko/paramiko/kex_group14.pyi | 2 +- stubs/paramiko/paramiko/kex_group16.pyi | 2 +- stubs/paramiko/paramiko/message.pyi | 3 ++- stubs/paramiko/paramiko/packet.pyi | 3 ++- stubs/paramiko/paramiko/py3compat.pyi | 3 ++- stubs/paramiko/paramiko/rsakey.pyi | 3 ++- stubs/paramiko/paramiko/sftp_client.pyi | 3 ++- stubs/paramiko/paramiko/sftp_file.pyi | 3 ++- stubs/paramiko/paramiko/ssh_exception.pyi | 2 +- stubs/paramiko/paramiko/transport.pyi | 3 ++- stubs/paramiko/paramiko/util.pyi | 3 ++- stubs/parsimonious/parsimonious/expressions.pyi | 3 ++- stubs/parsimonious/parsimonious/grammar.pyi | 3 ++- stubs/parsimonious/parsimonious/nodes.pyi | 3 ++- stubs/pep8-naming/pep8ext_naming.pyi | 3 ++- stubs/protobuf/google/protobuf/internal/containers.pyi | 4 ++-- stubs/protobuf/google/protobuf/internal/decoder.pyi | 3 ++- stubs/protobuf/google/protobuf/internal/encoder.pyi | 2 +- stubs/protobuf/google/protobuf/internal/extension_dict.pyi | 3 ++- stubs/protobuf/google/protobuf/message.pyi | 3 ++- stubs/protobuf/google/protobuf/message_factory.pyi | 3 ++- stubs/protobuf/google/protobuf/service.pyi | 3 ++- stubs/protobuf/google/protobuf/symbol_database.pyi | 2 +- stubs/protobuf/google/protobuf/text_format.pyi | 3 ++- stubs/psutil/psutil/__init__.pyi | 3 ++- stubs/psutil/psutil/_common.pyi | 3 ++- stubs/pyOpenSSL/OpenSSL/SSL.pyi | 3 ++- stubs/pyOpenSSL/OpenSSL/crypto.pyi | 3 ++- stubs/pysftp/pysftp/__init__.pyi | 3 ++- stubs/pytest-lazy-fixture/pytest_lazyfixture.pyi | 3 ++- stubs/python-slugify/slugify/slugify.pyi | 2 +- stubs/python-slugify/slugify/special.pyi | 2 +- stubs/redis/redis/client.pyi | 3 ++- stubs/redis/redis/connection.pyi | 3 ++- stubs/regex/regex/_regex.pyi | 3 ++- stubs/regex/regex/regex.pyi | 3 ++- stubs/requests/requests/adapters.pyi | 3 ++- stubs/requests/requests/cookies.pyi | 3 ++- stubs/requests/requests/models.pyi | 3 ++- stubs/requests/requests/sessions.pyi | 3 ++- stubs/requests/requests/structures.pyi | 3 ++- stubs/requests/requests/utils.pyi | 3 ++- stubs/setuptools/pkg_resources/__init__.pyi | 3 ++- stubs/setuptools/setuptools/command/test.pyi | 3 ++- stubs/toposort/toposort.pyi | 3 ++- stubs/typed-ast/typed_ast/ast27.pyi | 3 ++- stubs/typed-ast/typed_ast/ast3.pyi | 3 ++- stubs/urllib3/urllib3/_collections.pyi | 3 ++- stubs/urllib3/urllib3/connection.pyi | 3 ++- stubs/urllib3/urllib3/response.pyi | 3 ++- stubs/urllib3/urllib3/util/retry.pyi | 3 ++- stubs/vobject/vobject/base.pyi | 4 ++-- stubs/waitress/waitress/adjustments.pyi | 3 ++- stubs/waitress/waitress/buffers.pyi | 3 ++- stubs/waitress/waitress/channel.pyi | 2 +- stubs/waitress/waitress/parser.pyi | 3 ++- stubs/waitress/waitress/proxy_headers.pyi | 3 ++- stubs/waitress/waitress/runner.pyi | 3 ++- stubs/waitress/waitress/server.pyi | 3 ++- stubs/waitress/waitress/task.pyi | 3 ++- stubs/waitress/waitress/trigger.pyi | 2 +- stubs/waitress/waitress/utilities.pyi | 3 ++- stubs/waitress/waitress/wasyncore.pyi | 3 ++- stubs/xmltodict/xmltodict.pyi | 3 ++- 146 files changed, 268 insertions(+), 156 deletions(-) diff --git a/stubs/DateTimeRange/datetimerange/__init__.pyi b/stubs/DateTimeRange/datetimerange/__init__.pyi index 4da26321b..27160b820 100644 --- a/stubs/DateTimeRange/datetimerange/__init__.pyi +++ b/stubs/DateTimeRange/datetimerange/__init__.pyi @@ -1,6 +1,6 @@ import datetime from _typeshed import Self -from typing import Iterable +from collections.abc import Iterable from dateutil.relativedelta import relativedelta diff --git a/stubs/Flask-Cors/flask_cors/core.pyi b/stubs/Flask-Cors/flask_cors/core.pyi index d649b884c..7d760a187 100644 --- a/stubs/Flask-Cors/flask_cors/core.pyi +++ b/stubs/Flask-Cors/flask_cors/core.pyi @@ -1,6 +1,7 @@ +from collections.abc import Iterable from datetime import timedelta from logging import Logger -from typing import Any, Iterable, Pattern, TypeVar, overload +from typing import Any, Pattern, TypeVar, overload from typing_extensions import TypeAlias, TypedDict _IterableT = TypeVar("_IterableT", bound=Iterable[Any]) diff --git a/stubs/Flask-Cors/flask_cors/decorator.pyi b/stubs/Flask-Cors/flask_cors/decorator.pyi index 86808c1fe..4185f716c 100644 --- a/stubs/Flask-Cors/flask_cors/decorator.pyi +++ b/stubs/Flask-Cors/flask_cors/decorator.pyi @@ -1,6 +1,7 @@ +from collections.abc import Callable from datetime import timedelta from logging import Logger -from typing import Any, Callable +from typing import Any from typing_extensions import ParamSpec _P = ParamSpec("_P") diff --git a/stubs/Flask-Cors/flask_cors/extension.pyi b/stubs/Flask-Cors/flask_cors/extension.pyi index 4e2a630a7..b90878162 100644 --- a/stubs/Flask-Cors/flask_cors/extension.pyi +++ b/stubs/Flask-Cors/flask_cors/extension.pyi @@ -1,6 +1,7 @@ +from collections.abc import Callable, Iterable from datetime import timedelta from logging import Logger -from typing import Any, Callable, Iterable +from typing import Any _App = Any # flask is not part of typeshed diff --git a/stubs/JACK-Client/jack/__init__.pyi b/stubs/JACK-Client/jack/__init__.pyi index b8faf4eb2..09883b859 100644 --- a/stubs/JACK-Client/jack/__init__.pyi +++ b/stubs/JACK-Client/jack/__init__.pyi @@ -1,5 +1,6 @@ from _typeshed import Self -from typing import Any, Callable, Generator, Iterable, Iterator, Sequence, overload +from collections.abc import Callable, Generator, Iterable, Iterator, Sequence +from typing import Any, overload _NDArray = Any # FIXME: no typings for numpy arrays diff --git a/stubs/Markdown/markdown/blockparser.pyi b/stubs/Markdown/markdown/blockparser.pyi index e51db2372..fa9a0bf88 100644 --- a/stubs/Markdown/markdown/blockparser.pyi +++ b/stubs/Markdown/markdown/blockparser.pyi @@ -1,4 +1,5 @@ -from typing import Any, Iterable, TypeVar +from collections.abc import Iterable +from typing import Any, TypeVar from xml.etree.ElementTree import Element, ElementTree from . import Markdown diff --git a/stubs/Markdown/markdown/core.pyi b/stubs/Markdown/markdown/core.pyi index c1c527872..a5b09004e 100644 --- a/stubs/Markdown/markdown/core.pyi +++ b/stubs/Markdown/markdown/core.pyi @@ -1,5 +1,6 @@ from _typeshed import Self -from typing import Any, BinaryIO, Callable, ClassVar, Mapping, Sequence, Text, TextIO +from collections.abc import Callable, Mapping, Sequence +from typing import Any, BinaryIO, ClassVar, Text, TextIO from typing_extensions import Literal from xml.etree.ElementTree import Element diff --git a/stubs/Markdown/markdown/extensions/__init__.pyi b/stubs/Markdown/markdown/extensions/__init__.pyi index 8b6cd2a47..e01e02de6 100644 --- a/stubs/Markdown/markdown/extensions/__init__.pyi +++ b/stubs/Markdown/markdown/extensions/__init__.pyi @@ -1,4 +1,5 @@ -from typing import Any, Mapping +from collections.abc import Mapping +from typing import Any from markdown.core import Markdown diff --git a/stubs/Pillow/PIL/ExifTags.pyi b/stubs/Pillow/PIL/ExifTags.pyi index 0ad93f535..ada23d329 100644 --- a/stubs/Pillow/PIL/ExifTags.pyi +++ b/stubs/Pillow/PIL/ExifTags.pyi @@ -1,4 +1,4 @@ -from typing import Mapping +from collections.abc import Mapping TAGS: Mapping[int, str] GPSTAGS: Mapping[int, str] diff --git a/stubs/Pillow/PIL/Image.pyi b/stubs/Pillow/PIL/Image.pyi index bf6746cd4..9020e8b0e 100644 --- a/stubs/Pillow/PIL/Image.pyi +++ b/stubs/Pillow/PIL/Image.pyi @@ -1,7 +1,7 @@ from _typeshed import Self, SupportsRead, SupportsWrite -from collections.abc import Iterable, Iterator, MutableMapping +from collections.abc import Callable, Iterable, Iterator, MutableMapping, Sequence from pathlib import Path -from typing import Any, Callable, ClassVar, Protocol, Sequence, SupportsBytes, Union +from typing import Any, ClassVar, Protocol, SupportsBytes, Union from typing_extensions import Literal, TypeAlias from ._imaging import ( diff --git a/stubs/Pillow/PIL/ImageDraw.pyi b/stubs/Pillow/PIL/ImageDraw.pyi index 6f139926e..f4ba2e075 100644 --- a/stubs/Pillow/PIL/ImageDraw.pyi +++ b/stubs/Pillow/PIL/ImageDraw.pyi @@ -1,5 +1,5 @@ -from collections.abc import Container -from typing import Any, Sequence, overload +from collections.abc import Container, Sequence +from typing import Any, overload from typing_extensions import Literal, TypeAlias from .Image import Image diff --git a/stubs/Pillow/PIL/ImageFilter.pyi b/stubs/Pillow/PIL/ImageFilter.pyi index a46c06c39..fec57d3cc 100644 --- a/stubs/Pillow/PIL/ImageFilter.pyi +++ b/stubs/Pillow/PIL/ImageFilter.pyi @@ -1,5 +1,6 @@ from _typeshed import Self -from typing import Any, Callable, Iterable, Sequence +from collections.abc import Callable, Iterable, Sequence +from typing import Any from typing_extensions import Literal, TypeAlias from .Image import Image diff --git a/stubs/Pillow/PIL/ImageOps.pyi b/stubs/Pillow/PIL/ImageOps.pyi index fd178f12c..77b966203 100644 --- a/stubs/Pillow/PIL/ImageOps.pyi +++ b/stubs/Pillow/PIL/ImageOps.pyi @@ -1,4 +1,5 @@ -from typing import Any, Iterable, Protocol, Union +from collections.abc import Iterable +from typing import Any, Protocol, Union from typing_extensions import TypeAlias from .Image import Image, _Resample, _Size diff --git a/stubs/PyMySQL/pymysql/connections.pyi b/stubs/PyMySQL/pymysql/connections.pyi index 2b2b49d0a..ca98f0aa2 100644 --- a/stubs/PyMySQL/pymysql/connections.pyi +++ b/stubs/PyMySQL/pymysql/connections.pyi @@ -1,6 +1,7 @@ from _typeshed import Self +from collections.abc import Mapping from socket import socket as _socket -from typing import Any, AnyStr, Generic, Mapping, TypeVar, overload +from typing import Any, AnyStr, Generic, TypeVar, overload from .charset import charset_by_id as charset_by_id, charset_by_name as charset_by_name from .constants import CLIENT as CLIENT, COMMAND as COMMAND, FIELD_TYPE as FIELD_TYPE, SERVER_STATUS as SERVER_STATUS diff --git a/stubs/PyMySQL/pymysql/cursors.pyi b/stubs/PyMySQL/pymysql/cursors.pyi index 6e43797a3..58d4ea2ac 100644 --- a/stubs/PyMySQL/pymysql/cursors.pyi +++ b/stubs/PyMySQL/pymysql/cursors.pyi @@ -1,5 +1,6 @@ from _typeshed import Self -from typing import Any, Iterable, Iterator, Text +from collections.abc import Iterable, Iterator +from typing import Any, Text from .connections import Connection diff --git a/stubs/Pygments/pygments/formatters/__init__.pyi b/stubs/Pygments/pygments/formatters/__init__.pyi index 573b42de7..217aa9e4a 100644 --- a/stubs/Pygments/pygments/formatters/__init__.pyi +++ b/stubs/Pygments/pygments/formatters/__init__.pyi @@ -1,4 +1,5 @@ -from typing import Any, Generator +from collections.abc import Generator +from typing import Any from ..formatter import Formatter from .bbcode import BBCodeFormatter as BBCodeFormatter diff --git a/stubs/Pygments/pygments/plugin.pyi b/stubs/Pygments/pygments/plugin.pyi index 81e3554c0..308e21957 100644 --- a/stubs/Pygments/pygments/plugin.pyi +++ b/stubs/Pygments/pygments/plugin.pyi @@ -1,4 +1,5 @@ -from typing import Any, Generator, Iterable +from collections.abc import Generator, Iterable +from typing import Any from pkg_resources import EntryPoint from pygments.filter import Filter diff --git a/stubs/SQLAlchemy/sqlalchemy/engine/base.pyi b/stubs/SQLAlchemy/sqlalchemy/engine/base.pyi index c165a6448..624d1e2dc 100644 --- a/stubs/SQLAlchemy/sqlalchemy/engine/base.pyi +++ b/stubs/SQLAlchemy/sqlalchemy/engine/base.pyi @@ -1,8 +1,8 @@ from _typeshed import Self from abc import abstractmethod -from collections.abc import Mapping +from collections.abc import Callable, Mapping from types import TracebackType -from typing import Any, Callable, TypeVar, overload +from typing import Any, TypeVar, overload from typing_extensions import TypeAlias from ..dbapi import DBAPIConnection diff --git a/stubs/aiofiles/aiofiles/base.pyi b/stubs/aiofiles/aiofiles/base.pyi index 38c4ae102..8919031e2 100644 --- a/stubs/aiofiles/aiofiles/base.pyi +++ b/stubs/aiofiles/aiofiles/base.pyi @@ -1,6 +1,7 @@ from _typeshed import Self +from collections.abc import Coroutine, Generator, Iterator from types import CodeType, FrameType, TracebackType, coroutine -from typing import Any, Coroutine, Generator, Generic, Iterator, TypeVar +from typing import Any, Generic, TypeVar _T = TypeVar("_T") _T_co = TypeVar("_T_co", covariant=True) diff --git a/stubs/aiofiles/aiofiles/os.pyi b/stubs/aiofiles/aiofiles/os.pyi index 87a1cc4ab..0abdd736e 100644 --- a/stubs/aiofiles/aiofiles/os.pyi +++ b/stubs/aiofiles/aiofiles/os.pyi @@ -1,8 +1,9 @@ import sys from _typeshed import StrOrBytesPath from asyncio.events import AbstractEventLoop +from collections.abc import Sequence from os import stat_result -from typing import Any, Sequence, overload +from typing import Any, overload from typing_extensions import TypeAlias from . import ospath as path diff --git a/stubs/aiofiles/aiofiles/threadpool/__init__.pyi b/stubs/aiofiles/aiofiles/threadpool/__init__.pyi index 49262ebad..92d126d83 100644 --- a/stubs/aiofiles/aiofiles/threadpool/__init__.pyi +++ b/stubs/aiofiles/aiofiles/threadpool/__init__.pyi @@ -7,7 +7,8 @@ from _typeshed import ( StrOrBytesPath, ) from asyncio import AbstractEventLoop -from typing import Any, Callable, overload +from collections.abc import Callable +from typing import Any, overload from typing_extensions import Literal, TypeAlias from ..base import AiofilesContextManager diff --git a/stubs/aiofiles/aiofiles/threadpool/binary.pyi b/stubs/aiofiles/aiofiles/threadpool/binary.pyi index 27bfd7c85..2f7730064 100644 --- a/stubs/aiofiles/aiofiles/threadpool/binary.pyi +++ b/stubs/aiofiles/aiofiles/threadpool/binary.pyi @@ -1,6 +1,6 @@ from _typeshed import ReadableBuffer, StrOrBytesPath, WriteableBuffer +from collections.abc import Iterable from io import FileIO -from typing import Iterable from ..base import AsyncBase diff --git a/stubs/aiofiles/aiofiles/threadpool/text.pyi b/stubs/aiofiles/aiofiles/threadpool/text.pyi index 8711bddb4..4712e342e 100644 --- a/stubs/aiofiles/aiofiles/threadpool/text.pyi +++ b/stubs/aiofiles/aiofiles/threadpool/text.pyi @@ -1,5 +1,6 @@ from _typeshed import StrOrBytesPath -from typing import BinaryIO, Iterable +from collections.abc import Iterable +from typing import BinaryIO from ..base import AsyncBase diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/patcher.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/patcher.pyi index 49a46c7b1..e0c095775 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/patcher.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/patcher.pyi @@ -1,5 +1,6 @@ +from collections.abc import Iterable from logging import Logger -from typing import Any, Iterable +from typing import Any from aws_xray_sdk import global_sdk_config as global_sdk_config diff --git a/stubs/aws-xray-sdk/aws_xray_sdk/core/recorder.pyi b/stubs/aws-xray-sdk/aws_xray_sdk/core/recorder.pyi index f1c47af48..f8aecde4f 100644 --- a/stubs/aws-xray-sdk/aws_xray_sdk/core/recorder.pyi +++ b/stubs/aws-xray-sdk/aws_xray_sdk/core/recorder.pyi @@ -1,6 +1,7 @@ import time +from collections.abc import Callable, Iterable from logging import Logger -from typing import Any, Callable, Iterable +from typing import Any from aws_xray_sdk import global_sdk_config as global_sdk_config from aws_xray_sdk.version import VERSION as VERSION diff --git a/stubs/beautifulsoup4/bs4/__init__.pyi b/stubs/beautifulsoup4/bs4/__init__.pyi index 9245aba73..e62b04ddd 100644 --- a/stubs/beautifulsoup4/bs4/__init__.pyi +++ b/stubs/beautifulsoup4/bs4/__init__.pyi @@ -1,5 +1,6 @@ from _typeshed import Self, SupportsRead -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any from .builder import TreeBuilder from .element import ( diff --git a/stubs/beautifulsoup4/bs4/element.pyi b/stubs/beautifulsoup4/bs4/element.pyi index 974f39ac8..65361842d 100644 --- a/stubs/beautifulsoup4/bs4/element.pyi +++ b/stubs/beautifulsoup4/bs4/element.pyi @@ -1,6 +1,6 @@ from _typeshed import Self -from collections.abc import Iterator -from typing import Any, Callable, Generic, Iterable, Pattern, TypeVar, overload +from collections.abc import Callable, Iterable, Iterator +from typing import Any, Generic, Pattern, TypeVar, overload from typing_extensions import TypeAlias from . import BeautifulSoup diff --git a/stubs/beautifulsoup4/bs4/formatter.pyi b/stubs/beautifulsoup4/bs4/formatter.pyi index 19ceb3cf6..996f64a24 100644 --- a/stubs/beautifulsoup4/bs4/formatter.pyi +++ b/stubs/beautifulsoup4/bs4/formatter.pyi @@ -1,4 +1,4 @@ -from typing import Callable +from collections.abc import Callable from typing_extensions import TypeAlias from .dammit import EntitySubstitution as EntitySubstitution diff --git a/stubs/boto/boto/kms/layer1.pyi b/stubs/boto/boto/kms/layer1.pyi index 5a7496ee3..ed34447c7 100644 --- a/stubs/boto/boto/kms/layer1.pyi +++ b/stubs/boto/boto/kms/layer1.pyi @@ -1,4 +1,5 @@ -from typing import Any, Mapping +from collections.abc import Mapping +from typing import Any from boto.connection import AWSQueryConnection diff --git a/stubs/boto/boto/s3/bucketlistresultset.pyi b/stubs/boto/boto/s3/bucketlistresultset.pyi index e327ac424..258af6c35 100644 --- a/stubs/boto/boto/s3/bucketlistresultset.pyi +++ b/stubs/boto/boto/s3/bucketlistresultset.pyi @@ -1,4 +1,5 @@ -from typing import Any, Iterable, Iterator +from collections.abc import Iterable, Iterator +from typing import Any from .key import Key diff --git a/stubs/boto/boto/s3/key.pyi b/stubs/boto/boto/s3/key.pyi index 515491867..92be358b9 100644 --- a/stubs/boto/boto/s3/key.pyi +++ b/stubs/boto/boto/s3/key.pyi @@ -1,4 +1,5 @@ -from typing import Any, Callable, overload +from collections.abc import Callable +from typing import Any, overload class Key: DefaultContentType: str diff --git a/stubs/boto/boto/utils.pyi b/stubs/boto/boto/utils.pyi index 09c090a41..1e78fe5a8 100644 --- a/stubs/boto/boto/utils.pyi +++ b/stubs/boto/boto/utils.pyi @@ -3,8 +3,9 @@ import logging.handlers import subprocess import sys import time +from collections.abc import Callable, Iterable, Mapping, Sequence from contextlib import AbstractContextManager -from typing import IO, Any, Callable, Iterable, Mapping, Sequence, TypeVar +from typing import IO, Any, TypeVar from typing_extensions import TypeAlias import boto.connection diff --git a/stubs/cachetools/cachetools/__init__.pyi b/stubs/cachetools/cachetools/__init__.pyi index e4accb322..c3e6d95ff 100644 --- a/stubs/cachetools/cachetools/__init__.pyi +++ b/stubs/cachetools/cachetools/__init__.pyi @@ -1,7 +1,7 @@ from _typeshed import IdentityFunction -from collections.abc import Iterator, Sequence +from collections.abc import Callable, Iterator, MutableMapping, Sequence from contextlib import AbstractContextManager -from typing import Any, Callable, Generic, MutableMapping, TypeVar, overload +from typing import Any, Generic, TypeVar, overload __all__ = ("Cache", "FIFOCache", "LFUCache", "LRUCache", "MRUCache", "RRCache", "TLRUCache", "TTLCache", "cached", "cachedmethod") __version__: str diff --git a/stubs/cachetools/cachetools/func.pyi b/stubs/cachetools/cachetools/func.pyi index 378cbd91d..4d2238400 100644 --- a/stubs/cachetools/cachetools/func.pyi +++ b/stubs/cachetools/cachetools/func.pyi @@ -1,5 +1,6 @@ from _typeshed import IdentityFunction -from typing import Callable, Sequence, TypeVar +from collections.abc import Callable, Sequence +from typing import TypeVar __all__ = ("fifo_cache", "lfu_cache", "lru_cache", "mru_cache", "rr_cache", "ttl_cache") _T = TypeVar("_T") diff --git a/stubs/cachetools/cachetools/keys.pyi b/stubs/cachetools/cachetools/keys.pyi index c1867dce6..4a2ab17cb 100644 --- a/stubs/cachetools/cachetools/keys.pyi +++ b/stubs/cachetools/cachetools/keys.pyi @@ -1,4 +1,4 @@ -from typing import Hashable +from collections.abc import Hashable __all__ = ("hashkey", "typedkey") diff --git a/stubs/chevron/chevron/renderer.pyi b/stubs/chevron/chevron/renderer.pyi index 232253d91..fb2df7404 100755 --- a/stubs/chevron/chevron/renderer.pyi +++ b/stubs/chevron/chevron/renderer.pyi @@ -1,5 +1,6 @@ from _typeshed import StrPath, SupportsRead -from typing import Any, MutableSequence, Sequence +from collections.abc import MutableSequence, Sequence +from typing import Any g_token_cache: dict[str, list[tuple[str, str]]] # undocumented diff --git a/stubs/chevron/chevron/tokenizer.pyi b/stubs/chevron/chevron/tokenizer.pyi index cb362e61d..b34ed1cc8 100755 --- a/stubs/chevron/chevron/tokenizer.pyi +++ b/stubs/chevron/chevron/tokenizer.pyi @@ -1,4 +1,4 @@ -from typing import Iterator +from collections.abc import Iterator class ChevronError(SyntaxError): ... diff --git a/stubs/contextvars/contextvars.pyi b/stubs/contextvars/contextvars.pyi index 49e6e35b4..d363d7370 100644 --- a/stubs/contextvars/contextvars.pyi +++ b/stubs/contextvars/contextvars.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, Callable, ClassVar, Generic, Iterator, Mapping, TypeVar +from collections.abc import Callable, Iterator, Mapping +from typing import Any, ClassVar, Generic, TypeVar from typing_extensions import ParamSpec, final if sys.version_info >= (3, 9): diff --git a/stubs/cryptography/cryptography/hazmat/primitives/serialization/pkcs7.pyi b/stubs/cryptography/cryptography/hazmat/primitives/serialization/pkcs7.pyi index c403282f3..3bf5678a4 100644 --- a/stubs/cryptography/cryptography/hazmat/primitives/serialization/pkcs7.pyi +++ b/stubs/cryptography/cryptography/hazmat/primitives/serialization/pkcs7.pyi @@ -1,5 +1,6 @@ +from collections.abc import Iterable from enum import Enum -from typing import Any, Iterable +from typing import Any from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurvePrivateKey from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey diff --git a/stubs/cryptography/cryptography/x509/__init__.pyi b/stubs/cryptography/cryptography/x509/__init__.pyi index f821a5983..e4741a8e4 100644 --- a/stubs/cryptography/cryptography/x509/__init__.pyi +++ b/stubs/cryptography/cryptography/x509/__init__.pyi @@ -1,9 +1,10 @@ import datetime from _typeshed import Self from abc import ABCMeta, abstractmethod +from collections.abc import Generator, Iterable, Sequence from enum import Enum from ipaddress import IPv4Address, IPv4Network, IPv6Address, IPv6Network -from typing import Any, ClassVar, Generator, Generic, Iterable, Sequence, TypeVar +from typing import Any, ClassVar, Generic, TypeVar from cryptography.hazmat.backends.interfaces import X509Backend from cryptography.hazmat.primitives.asymmetric.dsa import DSAPrivateKey, DSAPublicKey diff --git a/stubs/dataclasses/dataclasses.pyi b/stubs/dataclasses/dataclasses.pyi index 8f76c6be1..38e34ccb9 100644 --- a/stubs/dataclasses/dataclasses.pyi +++ b/stubs/dataclasses/dataclasses.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, Callable, Generic, Iterable, Mapping, TypeVar, overload +from collections.abc import Callable, Iterable, Mapping +from typing import Any, Generic, TypeVar, overload if sys.version_info >= (3, 9): from types import GenericAlias diff --git a/stubs/dateparser/dateparser/languages/loader.pyi b/stubs/dateparser/dateparser/languages/loader.pyi index 8eaa38c77..87e532b2c 100644 --- a/stubs/dateparser/dateparser/languages/loader.pyi +++ b/stubs/dateparser/dateparser/languages/loader.pyi @@ -1,5 +1,6 @@ from collections import OrderedDict -from typing import Any, Iterator +from collections.abc import Iterator +from typing import Any from .locale import Locale diff --git a/stubs/dateparser/dateparser/utils/__init__.pyi b/stubs/dateparser/dateparser/utils/__init__.pyi index 1dd818985..769e865ce 100644 --- a/stubs/dateparser/dateparser/utils/__init__.pyi +++ b/stubs/dateparser/dateparser/utils/__init__.pyi @@ -1,5 +1,6 @@ from collections import OrderedDict -from typing import Any, Mapping +from collections.abc import Mapping +from typing import Any def strip_braces(date_string: str) -> str: ... def normalize_unicode(string: str, form: str = ...) -> str: ... diff --git a/stubs/decorator/decorator.pyi b/stubs/decorator/decorator.pyi index c2a4bed79..0999bc72e 100644 --- a/stubs/decorator/decorator.pyi +++ b/stubs/decorator/decorator.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, Callable, Iterator, NamedTuple, Pattern, Text, TypeVar +from collections.abc import Callable, Iterator +from typing import Any, NamedTuple, Pattern, Text, TypeVar from typing_extensions import ParamSpec _C = TypeVar("_C", bound=Callable[..., Any]) diff --git a/stubs/docutils/docutils/parsers/rst/roles.pyi b/stubs/docutils/docutils/parsers/rst/roles.pyi index b35f2be7a..f21d07d17 100644 --- a/stubs/docutils/docutils/parsers/rst/roles.pyi +++ b/stubs/docutils/docutils/parsers/rst/roles.pyi @@ -1,4 +1,5 @@ -from typing import Any, Callable +from collections.abc import Callable +from typing import Any from typing_extensions import TypeAlias import docutils.nodes diff --git a/stubs/editdistance/editdistance.pyi b/stubs/editdistance/editdistance.pyi index 082b0acc0..360884973 100644 --- a/stubs/editdistance/editdistance.pyi +++ b/stubs/editdistance/editdistance.pyi @@ -1,4 +1,4 @@ -from typing import Hashable, Iterable +from collections.abc import Hashable, Iterable def eval(a: Iterable[Hashable], b: Iterable[Hashable]) -> int: ... def distance(a: Iterable[Hashable], b: Iterable[Hashable]) -> int: ... diff --git a/stubs/flake8-2020/flake8_2020.pyi b/stubs/flake8-2020/flake8_2020.pyi index b46c3d5ed..1ad67f93e 100644 --- a/stubs/flake8-2020/flake8_2020.pyi +++ b/stubs/flake8-2020/flake8_2020.pyi @@ -3,7 +3,8 @@ # Therefore typeshed is the best place. import ast -from typing import Any, ClassVar, Generator +from collections.abc import Generator +from typing import Any, ClassVar class Plugin: name: ClassVar[str] diff --git a/stubs/flake8-bugbear/bugbear.pyi b/stubs/flake8-bugbear/bugbear.pyi index b435e5bce..dac90d0c1 100644 --- a/stubs/flake8-bugbear/bugbear.pyi +++ b/stubs/flake8-bugbear/bugbear.pyi @@ -1,6 +1,7 @@ import argparse import ast -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any class BugBearChecker: name: str diff --git a/stubs/flake8-builtins/flake8_builtins.pyi b/stubs/flake8-builtins/flake8_builtins.pyi index 904be75d3..ffca177d8 100644 --- a/stubs/flake8-builtins/flake8_builtins.pyi +++ b/stubs/flake8-builtins/flake8_builtins.pyi @@ -1,5 +1,6 @@ import ast -from typing import Any, ClassVar, Generator +from collections.abc import Generator +from typing import Any, ClassVar class BuiltinsChecker: name: ClassVar[str] diff --git a/stubs/flake8-docstrings/flake8_docstrings.pyi b/stubs/flake8-docstrings/flake8_docstrings.pyi index 80c252903..08bdc39e0 100644 --- a/stubs/flake8-docstrings/flake8_docstrings.pyi +++ b/stubs/flake8-docstrings/flake8_docstrings.pyi @@ -1,6 +1,7 @@ import argparse import ast -from typing import Any, ClassVar, Generator, Iterable +from collections.abc import Generator, Iterable +from typing import Any, ClassVar class pep257Checker: name: ClassVar[str] diff --git a/stubs/flake8-plugin-utils/flake8_plugin_utils/plugin.pyi b/stubs/flake8-plugin-utils/flake8_plugin_utils/plugin.pyi index 353b6df11..bba6537ff 100644 --- a/stubs/flake8-plugin-utils/flake8_plugin_utils/plugin.pyi +++ b/stubs/flake8-plugin-utils/flake8_plugin_utils/plugin.pyi @@ -1,6 +1,7 @@ import argparse import ast -from typing import Any, Generic, Iterable, Iterator, TypeVar +from collections.abc import Iterable, Iterator +from typing import Any, Generic, TypeVar from typing_extensions import TypeAlias FLAKE8_ERROR: TypeAlias = tuple[int, int, str, type[Any]] diff --git a/stubs/flake8-rst-docstrings/flake8_rst_docstrings.pyi b/stubs/flake8-rst-docstrings/flake8_rst_docstrings.pyi index 399f7cb53..3b3605b88 100644 --- a/stubs/flake8-rst-docstrings/flake8_rst_docstrings.pyi +++ b/stubs/flake8-rst-docstrings/flake8_rst_docstrings.pyi @@ -1,7 +1,7 @@ import ast from argparse import Namespace -from collections.abc import Container -from typing import Any, Generator +from collections.abc import Container, Generator +from typing import Any rst_prefix: str rst_fail_load: int diff --git a/stubs/flake8-simplify/flake8_simplify/__init__.pyi b/stubs/flake8-simplify/flake8_simplify/__init__.pyi index 7296c8a25..c1831fa38 100644 --- a/stubs/flake8-simplify/flake8_simplify/__init__.pyi +++ b/stubs/flake8-simplify/flake8_simplify/__init__.pyi @@ -1,5 +1,6 @@ import ast -from typing import Any, ClassVar, Generator +from collections.abc import Generator +from typing import Any, ClassVar class Plugin: name: ClassVar[str] diff --git a/stubs/flake8-typing-imports/flake8_typing_imports.pyi b/stubs/flake8-typing-imports/flake8_typing_imports.pyi index 0b3fe50a1..8ea857c9b 100644 --- a/stubs/flake8-typing-imports/flake8_typing_imports.pyi +++ b/stubs/flake8-typing-imports/flake8_typing_imports.pyi @@ -1,6 +1,7 @@ import argparse import ast -from typing import Any, ClassVar, Generator +from collections.abc import Generator +from typing import Any, ClassVar class Plugin: name: ClassVar[str] diff --git a/stubs/frozendict/frozendict.pyi b/stubs/frozendict/frozendict.pyi index 6d72eb5cd..03c41f4d2 100644 --- a/stubs/frozendict/frozendict.pyi +++ b/stubs/frozendict/frozendict.pyi @@ -1,6 +1,7 @@ import collections from _typeshed import Self -from typing import Any, Generic, Iterable, Iterator, Mapping, TypeVar, overload +from collections.abc import Iterable, Iterator, Mapping +from typing import Any, Generic, TypeVar, overload _KT = TypeVar("_KT") _VT = TypeVar("_VT") diff --git a/stubs/google-cloud-ndb/google/cloud/ndb/context.pyi b/stubs/google-cloud-ndb/google/cloud/ndb/context.pyi index da13d6b33..3f54d9add 100644 --- a/stubs/google-cloud-ndb/google/cloud/ndb/context.pyi +++ b/stubs/google-cloud-ndb/google/cloud/ndb/context.pyi @@ -1,4 +1,5 @@ -from typing import Any, Callable, NamedTuple +from collections.abc import Callable +from typing import Any, NamedTuple from google.cloud.ndb import Key, exceptions as exceptions diff --git a/stubs/google-cloud-ndb/google/cloud/ndb/model.pyi b/stubs/google-cloud-ndb/google/cloud/ndb/model.pyi index 7b63e881f..c416cd7da 100644 --- a/stubs/google-cloud-ndb/google/cloud/ndb/model.pyi +++ b/stubs/google-cloud-ndb/google/cloud/ndb/model.pyi @@ -1,7 +1,7 @@ import datetime from _typeshed import Self -from collections.abc import Iterable, Sequence -from typing import Any, Callable, NoReturn +from collections.abc import Callable, Iterable, Sequence +from typing import Any, NoReturn from typing_extensions import Literal, TypeAlias from google.cloud.ndb import exceptions, key as key_module, query as query_module, tasklets as tasklets_module diff --git a/stubs/hdbcli/hdbcli/dbapi.pyi b/stubs/hdbcli/hdbcli/dbapi.pyi index 89b3dde56..3ec97b6fe 100644 --- a/stubs/hdbcli/hdbcli/dbapi.pyi +++ b/stubs/hdbcli/hdbcli/dbapi.pyi @@ -1,7 +1,8 @@ import decimal from _typeshed import ReadableBuffer +from collections.abc import Sequence from datetime import date, datetime, time -from typing import Any, Sequence, overload +from typing import Any, overload from typing_extensions import Literal, TypeAlias from .resultrow import ResultRow diff --git a/stubs/invoke/invoke/completion/complete.pyi b/stubs/invoke/invoke/completion/complete.pyi index a59c2c44e..bca03430b 100644 --- a/stubs/invoke/invoke/completion/complete.pyi +++ b/stubs/invoke/invoke/completion/complete.pyi @@ -1,4 +1,5 @@ -from typing import Iterable, NoReturn, Sequence +from collections.abc import Iterable, Sequence +from typing import NoReturn from ..collection import Collection from ..parser import ParserContext, ParseResult diff --git a/stubs/invoke/invoke/executor.pyi b/stubs/invoke/invoke/executor.pyi index 7d8852cf2..cb79f60c1 100644 --- a/stubs/invoke/invoke/executor.pyi +++ b/stubs/invoke/invoke/executor.pyi @@ -1,4 +1,5 @@ -from typing import Any, Iterable +from collections.abc import Iterable +from typing import Any from .collection import Collection from .config import Config diff --git a/stubs/invoke/invoke/util.pyi b/stubs/invoke/invoke/util.pyi index f99b77930..7b08fef8e 100644 --- a/stubs/invoke/invoke/util.pyi +++ b/stubs/invoke/invoke/util.pyi @@ -1,8 +1,9 @@ import threading +from collections.abc import Callable, Iterable, Mapping from contextlib import AbstractContextManager from logging import Logger from types import TracebackType -from typing import Any, Callable, Iterable, Mapping, NamedTuple +from typing import Any, NamedTuple LOG_FORMAT: str diff --git a/stubs/invoke/invoke/watchers.pyi b/stubs/invoke/invoke/watchers.pyi index d1da58a97..35e3cb571 100644 --- a/stubs/invoke/invoke/watchers.pyi +++ b/stubs/invoke/invoke/watchers.pyi @@ -1,5 +1,5 @@ import threading -from typing import Iterable +from collections.abc import Iterable class StreamWatcher(threading.local): def submit(self, stream) -> Iterable[str]: ... diff --git a/stubs/jsonschema/jsonschema/_format.pyi b/stubs/jsonschema/jsonschema/_format.pyi index 492800ab5..7a42455fb 100644 --- a/stubs/jsonschema/jsonschema/_format.pyi +++ b/stubs/jsonschema/jsonschema/_format.pyi @@ -1,4 +1,5 @@ -from typing import Any, Iterable +from collections.abc import Iterable +from typing import Any class FormatChecker: checkers: Any diff --git a/stubs/jsonschema/jsonschema/_legacy_validators.pyi b/stubs/jsonschema/jsonschema/_legacy_validators.pyi index 08a7dd539..783d3e5b3 100644 --- a/stubs/jsonschema/jsonschema/_legacy_validators.pyi +++ b/stubs/jsonschema/jsonschema/_legacy_validators.pyi @@ -1,4 +1,5 @@ -from typing import Any, ItemsView +from collections.abc import ItemsView +from typing import Any def ignore_ref_siblings(schema) -> list[tuple[str, Any]] | ItemsView[str, Any]: ... def dependencies_draft3(validator, dependencies, instance, schema) -> None: ... diff --git a/stubs/jsonschema/jsonschema/_types.pyi b/stubs/jsonschema/jsonschema/_types.pyi index 5c9705544..2a3641d32 100644 --- a/stubs/jsonschema/jsonschema/_types.pyi +++ b/stubs/jsonschema/jsonschema/_types.pyi @@ -1,4 +1,4 @@ -from typing import Callable, Iterable, Mapping +from collections.abc import Callable, Iterable, Mapping def is_array(checker, instance) -> bool: ... def is_bool(checker, instance) -> bool: ... diff --git a/stubs/jsonschema/jsonschema/_utils.pyi b/stubs/jsonschema/jsonschema/_utils.pyi index 2b20d72a5..7e5720e70 100644 --- a/stubs/jsonschema/jsonschema/_utils.pyi +++ b/stubs/jsonschema/jsonschema/_utils.pyi @@ -1,5 +1,6 @@ from _typeshed import SupportsKeysAndGetItem -from typing import Any, Generator, Iterable, Iterator, Mapping, MutableMapping, Sized +from collections.abc import Generator, Iterable, Iterator, Mapping, MutableMapping, Sized +from typing import Any class URIDict(MutableMapping[str, str]): def normalize(self, uri: str) -> str: ... diff --git a/stubs/jsonschema/jsonschema/protocols.pyi b/stubs/jsonschema/jsonschema/protocols.pyi index 16610ac2e..1a6ff086a 100644 --- a/stubs/jsonschema/jsonschema/protocols.pyi +++ b/stubs/jsonschema/jsonschema/protocols.pyi @@ -1,4 +1,5 @@ -from typing import Any, ClassVar, Iterator, Protocol +from collections.abc import Iterator +from typing import Any, ClassVar, Protocol from jsonschema._format import FormatChecker from jsonschema._types import TypeChecker diff --git a/stubs/jsonschema/jsonschema/validators.pyi b/stubs/jsonschema/jsonschema/validators.pyi index 70787bb61..577cdbd11 100644 --- a/stubs/jsonschema/jsonschema/validators.pyi +++ b/stubs/jsonschema/jsonschema/validators.pyi @@ -1,6 +1,6 @@ from _typeshed import SupportsKeysAndGetItem -from collections.abc import Callable, Generator, Iterable -from typing import Any, ClassVar, Mapping +from collections.abc import Callable, Generator, Iterable, Mapping +from typing import Any, ClassVar from typing_extensions import TypeAlias from ._utils import URIDict diff --git a/stubs/opentracing/opentracing/harness/scope_check.pyi b/stubs/opentracing/opentracing/harness/scope_check.pyi index affe51501..dd7618a0a 100644 --- a/stubs/opentracing/opentracing/harness/scope_check.pyi +++ b/stubs/opentracing/opentracing/harness/scope_check.pyi @@ -1,4 +1,5 @@ -from typing import Any, Callable +from collections.abc import Callable +from typing import Any from ..scope_manager import ScopeManager diff --git a/stubs/paramiko/paramiko/auth_handler.pyi b/stubs/paramiko/paramiko/auth_handler.pyi index abb758338..d82d27e3c 100644 --- a/stubs/paramiko/paramiko/auth_handler.pyi +++ b/stubs/paramiko/paramiko/auth_handler.pyi @@ -1,5 +1,5 @@ +from collections.abc import Callable from threading import Event -from typing import Callable from typing_extensions import TypeAlias from paramiko.pkey import PKey diff --git a/stubs/paramiko/paramiko/ber.pyi b/stubs/paramiko/paramiko/ber.pyi index 906dd2564..831ef1ef6 100644 --- a/stubs/paramiko/paramiko/ber.pyi +++ b/stubs/paramiko/paramiko/ber.pyi @@ -1,4 +1,5 @@ -from typing import Any, Iterable +from collections.abc import Iterable +from typing import Any class BERException(Exception): ... diff --git a/stubs/paramiko/paramiko/channel.pyi b/stubs/paramiko/paramiko/channel.pyi index 1870c9e1f..a48fedac5 100644 --- a/stubs/paramiko/paramiko/channel.pyi +++ b/stubs/paramiko/paramiko/channel.pyi @@ -1,6 +1,7 @@ +from collections.abc import Callable, Mapping from logging import Logger from threading import Condition, Event, Lock -from typing import Any, Callable, Mapping, TypeVar +from typing import Any, TypeVar from paramiko.buffered_pipe import BufferedPipe from paramiko.file import BufferedFile diff --git a/stubs/paramiko/paramiko/client.pyi b/stubs/paramiko/paramiko/client.pyi index 42fca3991..103c50b7c 100644 --- a/stubs/paramiko/paramiko/client.pyi +++ b/stubs/paramiko/paramiko/client.pyi @@ -1,4 +1,5 @@ -from typing import Iterable, Mapping, NoReturn +from collections.abc import Iterable, Mapping +from typing import NoReturn from paramiko.channel import Channel, ChannelFile, ChannelStderrFile, ChannelStdinFile from paramiko.hostkeys import HostKeys diff --git a/stubs/paramiko/paramiko/config.pyi b/stubs/paramiko/paramiko/config.pyi index 2e2bb1118..f75c3ca75 100644 --- a/stubs/paramiko/paramiko/config.pyi +++ b/stubs/paramiko/paramiko/config.pyi @@ -1,5 +1,6 @@ from _typeshed import Self -from typing import IO, Any, Iterable, Pattern +from collections.abc import Iterable +from typing import IO, Any, Pattern from paramiko.ssh_exception import ConfigParseError as ConfigParseError, CouldNotCanonicalize as CouldNotCanonicalize diff --git a/stubs/paramiko/paramiko/dsskey.pyi b/stubs/paramiko/paramiko/dsskey.pyi index 86a57d5e3..af46bc9a8 100644 --- a/stubs/paramiko/paramiko/dsskey.pyi +++ b/stubs/paramiko/paramiko/dsskey.pyi @@ -1,4 +1,5 @@ -from typing import IO, Any, Callable +from collections.abc import Callable +from typing import IO, Any from paramiko.message import Message from paramiko.pkey import PKey diff --git a/stubs/paramiko/paramiko/ecdsakey.pyi b/stubs/paramiko/paramiko/ecdsakey.pyi index b99315194..fd8ae2506 100644 --- a/stubs/paramiko/paramiko/ecdsakey.pyi +++ b/stubs/paramiko/paramiko/ecdsakey.pyi @@ -1,4 +1,5 @@ -from typing import IO, Any, Callable, Sequence +from collections.abc import Callable, Sequence +from typing import IO, Any from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurve, EllipticCurvePrivateKey, EllipticCurvePublicKey from cryptography.hazmat.primitives.hashes import HashAlgorithm diff --git a/stubs/paramiko/paramiko/file.pyi b/stubs/paramiko/paramiko/file.pyi index 45c4acab1..e84863cf5 100644 --- a/stubs/paramiko/paramiko/file.pyi +++ b/stubs/paramiko/paramiko/file.pyi @@ -1,4 +1,5 @@ -from typing import Any, AnyStr, Generic, Iterable +from collections.abc import Iterable +from typing import Any, AnyStr, Generic from paramiko.util import ClosingContextManager diff --git a/stubs/paramiko/paramiko/hostkeys.pyi b/stubs/paramiko/paramiko/hostkeys.pyi index 8278af054..96d9d4816 100644 --- a/stubs/paramiko/paramiko/hostkeys.pyi +++ b/stubs/paramiko/paramiko/hostkeys.pyi @@ -1,5 +1,5 @@ from _typeshed import Self -from typing import Iterator, Mapping, MutableMapping +from collections.abc import Iterator, Mapping, MutableMapping from paramiko.pkey import PKey diff --git a/stubs/paramiko/paramiko/kex_curve25519.pyi b/stubs/paramiko/paramiko/kex_curve25519.pyi index c2811dd70..1371a66ea 100644 --- a/stubs/paramiko/paramiko/kex_curve25519.pyi +++ b/stubs/paramiko/paramiko/kex_curve25519.pyi @@ -1,6 +1,6 @@ import sys from _typeshed import ReadableBuffer as ReadableBuffer -from typing import Callable +from collections.abc import Callable from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey from paramiko.message import Message diff --git a/stubs/paramiko/paramiko/kex_ecdh_nist.pyi b/stubs/paramiko/paramiko/kex_ecdh_nist.pyi index aec8d912a..17ca312a0 100644 --- a/stubs/paramiko/paramiko/kex_ecdh_nist.pyi +++ b/stubs/paramiko/paramiko/kex_ecdh_nist.pyi @@ -1,6 +1,6 @@ import sys from _typeshed import ReadableBuffer -from typing import Callable +from collections.abc import Callable from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurve, EllipticCurvePrivateKey, EllipticCurvePublicKey from paramiko.message import Message diff --git a/stubs/paramiko/paramiko/kex_gex.pyi b/stubs/paramiko/paramiko/kex_gex.pyi index a47717ec9..b2d3b4062 100644 --- a/stubs/paramiko/paramiko/kex_gex.pyi +++ b/stubs/paramiko/paramiko/kex_gex.pyi @@ -1,6 +1,6 @@ import sys from _typeshed import ReadableBuffer -from typing import Callable +from collections.abc import Callable from paramiko.message import Message from paramiko.transport import Transport diff --git a/stubs/paramiko/paramiko/kex_group1.pyi b/stubs/paramiko/paramiko/kex_group1.pyi index 8b6ae8842..dadb71716 100644 --- a/stubs/paramiko/paramiko/kex_group1.pyi +++ b/stubs/paramiko/paramiko/kex_group1.pyi @@ -1,6 +1,6 @@ import sys from _typeshed import ReadableBuffer -from typing import Callable +from collections.abc import Callable from paramiko.message import Message from paramiko.transport import Transport diff --git a/stubs/paramiko/paramiko/kex_group14.pyi b/stubs/paramiko/paramiko/kex_group14.pyi index 276f9e5cd..75027c2b5 100644 --- a/stubs/paramiko/paramiko/kex_group14.pyi +++ b/stubs/paramiko/paramiko/kex_group14.pyi @@ -1,6 +1,6 @@ import sys from _typeshed import ReadableBuffer -from typing import Callable +from collections.abc import Callable from paramiko.kex_group1 import KexGroup1 as KexGroup1 diff --git a/stubs/paramiko/paramiko/kex_group16.pyi b/stubs/paramiko/paramiko/kex_group16.pyi index d85490cd4..cf660e92d 100644 --- a/stubs/paramiko/paramiko/kex_group16.pyi +++ b/stubs/paramiko/paramiko/kex_group16.pyi @@ -1,6 +1,6 @@ import sys from _typeshed import ReadableBuffer -from typing import Callable +from collections.abc import Callable from paramiko.kex_group1 import KexGroup1 as KexGroup1 diff --git a/stubs/paramiko/paramiko/message.pyi b/stubs/paramiko/paramiko/message.pyi index 0f469a3aa..1fa70cad3 100644 --- a/stubs/paramiko/paramiko/message.pyi +++ b/stubs/paramiko/paramiko/message.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, Iterable +from collections.abc import Iterable +from typing import Any from typing_extensions import TypeAlias from .common import _LikeBytes diff --git a/stubs/paramiko/paramiko/packet.pyi b/stubs/paramiko/paramiko/packet.pyi index 5d2c251db..1c44f79ae 100644 --- a/stubs/paramiko/paramiko/packet.pyi +++ b/stubs/paramiko/paramiko/packet.pyi @@ -1,7 +1,8 @@ import sys +from collections.abc import Callable from logging import Logger from socket import socket -from typing import Any, Callable +from typing import Any from cryptography.hazmat.primitives.ciphers import Cipher from paramiko.compress import ZlibCompressor, ZlibDecompressor diff --git a/stubs/paramiko/paramiko/py3compat.pyi b/stubs/paramiko/paramiko/py3compat.pyi index f4d27cf6e..601009d6d 100644 --- a/stubs/paramiko/paramiko/py3compat.pyi +++ b/stubs/paramiko/paramiko/py3compat.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, Iterable, Sequence, TypeVar +from collections.abc import Iterable, Sequence +from typing import Any, TypeVar _T = TypeVar("_T") diff --git a/stubs/paramiko/paramiko/rsakey.pyi b/stubs/paramiko/paramiko/rsakey.pyi index 7c76e60e2..7ce264ef1 100644 --- a/stubs/paramiko/paramiko/rsakey.pyi +++ b/stubs/paramiko/paramiko/rsakey.pyi @@ -1,4 +1,5 @@ -from typing import IO, Any, Callable +from collections.abc import Callable +from typing import IO, Any from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey, RSAPublicKey, RSAPublicNumbers from paramiko.message import Message diff --git a/stubs/paramiko/paramiko/sftp_client.pyi b/stubs/paramiko/paramiko/sftp_client.pyi index b22de5520..3ca463b55 100644 --- a/stubs/paramiko/paramiko/sftp_client.pyi +++ b/stubs/paramiko/paramiko/sftp_client.pyi @@ -1,6 +1,7 @@ from _typeshed import Self +from collections.abc import Callable, Iterator from logging import Logger -from typing import IO, Any, Callable, Iterator +from typing import IO, Any from typing_extensions import TypeAlias from paramiko.channel import Channel diff --git a/stubs/paramiko/paramiko/sftp_file.pyi b/stubs/paramiko/paramiko/sftp_file.pyi index 9663fccab..50415d127 100644 --- a/stubs/paramiko/paramiko/sftp_file.pyi +++ b/stubs/paramiko/paramiko/sftp_file.pyi @@ -1,4 +1,5 @@ -from typing import Any, Iterator, Sequence +from collections.abc import Iterator, Sequence +from typing import Any from paramiko.file import BufferedFile from paramiko.sftp_attr import SFTPAttributes diff --git a/stubs/paramiko/paramiko/ssh_exception.pyi b/stubs/paramiko/paramiko/ssh_exception.pyi index c122d63e1..9f617e0e3 100644 --- a/stubs/paramiko/paramiko/ssh_exception.pyi +++ b/stubs/paramiko/paramiko/ssh_exception.pyi @@ -1,5 +1,5 @@ import socket -from typing import Mapping +from collections.abc import Mapping from paramiko.pkey import PKey diff --git a/stubs/paramiko/paramiko/transport.pyi b/stubs/paramiko/paramiko/transport.pyi index 7781f8bf2..2de6bc62c 100644 --- a/stubs/paramiko/paramiko/transport.pyi +++ b/stubs/paramiko/paramiko/transport.pyi @@ -1,8 +1,9 @@ +from collections.abc import Callable, Iterable, Sequence from logging import Logger from socket import socket from threading import Condition, Event, Lock, Thread from types import ModuleType -from typing import Any, Callable, Iterable, Protocol, Sequence +from typing import Any, Protocol from typing_extensions import TypeAlias from paramiko.auth_handler import AuthHandler, _InteractiveCallback diff --git a/stubs/paramiko/paramiko/util.pyi b/stubs/paramiko/paramiko/util.pyi index ea3eebce7..d34e4bddf 100644 --- a/stubs/paramiko/paramiko/util.pyi +++ b/stubs/paramiko/paramiko/util.pyi @@ -1,8 +1,9 @@ import sys from _typeshed import Self +from collections.abc import Callable from logging import Logger, LogRecord from types import TracebackType -from typing import IO, AnyStr, Callable, Protocol, TypeVar +from typing import IO, AnyStr, Protocol, TypeVar from paramiko.config import SSHConfig, SSHConfigDict from paramiko.hostkeys import HostKeys diff --git a/stubs/parsimonious/parsimonious/expressions.pyi b/stubs/parsimonious/parsimonious/expressions.pyi index 1fb124e56..c89623b09 100644 --- a/stubs/parsimonious/parsimonious/expressions.pyi +++ b/stubs/parsimonious/parsimonious/expressions.pyi @@ -1,5 +1,6 @@ import typing -from typing import Any, Callable, Mapping, Pattern, Union +from collections.abc import Callable, Mapping +from typing import Any, Pattern, Union from typing_extensions import TypeAlias from parsimonious.exceptions import ParseError diff --git a/stubs/parsimonious/parsimonious/grammar.pyi b/stubs/parsimonious/parsimonious/grammar.pyi index 2b6e01266..a0acc9e47 100644 --- a/stubs/parsimonious/parsimonious/grammar.pyi +++ b/stubs/parsimonious/parsimonious/grammar.pyi @@ -1,6 +1,7 @@ import typing from collections import OrderedDict -from typing import Any, Callable, Mapping, NoReturn +from collections.abc import Callable, Mapping +from typing import Any, NoReturn from parsimonious.expressions import _CALLABLE_TYPE, Expression, Literal, Lookahead, Not, OneOf, Regex, Sequence, TokenMatcher from parsimonious.nodes import Node, NodeVisitor diff --git a/stubs/parsimonious/parsimonious/nodes.pyi b/stubs/parsimonious/parsimonious/nodes.pyi index 31e6c00d0..cb658ce35 100644 --- a/stubs/parsimonious/parsimonious/nodes.pyi +++ b/stubs/parsimonious/parsimonious/nodes.pyi @@ -1,4 +1,5 @@ -from typing import Any, Callable, Iterator, Match, NoReturn, Sequence, TypeVar +from collections.abc import Callable, Iterator, Sequence +from typing import Any, Match, NoReturn, TypeVar from parsimonious.exceptions import VisitationError as VisitationError from parsimonious.expressions import Expression diff --git a/stubs/pep8-naming/pep8ext_naming.pyi b/stubs/pep8-naming/pep8ext_naming.pyi index 9c6fd6fb8..eb05c0944 100644 --- a/stubs/pep8-naming/pep8ext_naming.pyi +++ b/stubs/pep8-naming/pep8ext_naming.pyi @@ -1,6 +1,7 @@ import ast from argparse import Namespace -from typing import Any, Generator +from collections.abc import Generator +from typing import Any __version__: str diff --git a/stubs/protobuf/google/protobuf/internal/containers.pyi b/stubs/protobuf/google/protobuf/internal/containers.pyi index 0d7a97a4a..7ec7c98d5 100644 --- a/stubs/protobuf/google/protobuf/internal/containers.pyi +++ b/stubs/protobuf/google/protobuf/internal/containers.pyi @@ -1,5 +1,5 @@ -from collections.abc import MutableMapping -from typing import Any, Callable, Iterable, Iterator, Sequence, Text, TypeVar, overload +from collections.abc import Callable, Iterable, Iterator, MutableMapping, Sequence +from typing import Any, Text, TypeVar, overload from typing_extensions import SupportsIndex from google.protobuf.descriptor import Descriptor diff --git a/stubs/protobuf/google/protobuf/internal/decoder.pyi b/stubs/protobuf/google/protobuf/internal/decoder.pyi index 09afc636d..41a50035b 100644 --- a/stubs/protobuf/google/protobuf/internal/decoder.pyi +++ b/stubs/protobuf/google/protobuf/internal/decoder.pyi @@ -1,4 +1,5 @@ -from typing import Any, Callable +from collections.abc import Callable +from typing import Any from typing_extensions import TypeAlias from google.protobuf.descriptor import Descriptor, FieldDescriptor diff --git a/stubs/protobuf/google/protobuf/internal/encoder.pyi b/stubs/protobuf/google/protobuf/internal/encoder.pyi index 9dc9b195c..278478edb 100644 --- a/stubs/protobuf/google/protobuf/internal/encoder.pyi +++ b/stubs/protobuf/google/protobuf/internal/encoder.pyi @@ -1,4 +1,4 @@ -from typing import Callable +from collections.abc import Callable from typing_extensions import TypeAlias from google.protobuf.descriptor import FieldDescriptor diff --git a/stubs/protobuf/google/protobuf/internal/extension_dict.pyi b/stubs/protobuf/google/protobuf/internal/extension_dict.pyi index a8aead6fd..acdfc7ced 100644 --- a/stubs/protobuf/google/protobuf/internal/extension_dict.pyi +++ b/stubs/protobuf/google/protobuf/internal/extension_dict.pyi @@ -1,4 +1,5 @@ -from typing import Any, Generic, Iterator, Text, TypeVar +from collections.abc import Iterator +from typing import Any, Generic, Text, TypeVar from google.protobuf.descriptor import FieldDescriptor from google.protobuf.internal.containers import RepeatedCompositeFieldContainer, RepeatedScalarFieldContainer diff --git a/stubs/protobuf/google/protobuf/message.pyi b/stubs/protobuf/google/protobuf/message.pyi index 340b3ac77..8a90d7c96 100644 --- a/stubs/protobuf/google/protobuf/message.pyi +++ b/stubs/protobuf/google/protobuf/message.pyi @@ -1,5 +1,6 @@ from _typeshed import Self -from typing import Any, Sequence, TypeVar +from collections.abc import Sequence +from typing import Any, TypeVar from .descriptor import Descriptor, FieldDescriptor from .internal.extension_dict import _ExtensionDict, _ExtensionFieldDescriptor diff --git a/stubs/protobuf/google/protobuf/message_factory.pyi b/stubs/protobuf/google/protobuf/message_factory.pyi index c8fb7983d..5493ea889 100644 --- a/stubs/protobuf/google/protobuf/message_factory.pyi +++ b/stubs/protobuf/google/protobuf/message_factory.pyi @@ -1,4 +1,5 @@ -from typing import Any, Iterable +from collections.abc import Iterable +from typing import Any from google.protobuf.descriptor import Descriptor from google.protobuf.descriptor_pb2 import FileDescriptorProto diff --git a/stubs/protobuf/google/protobuf/service.pyi b/stubs/protobuf/google/protobuf/service.pyi index 757c2449e..b650a8ed3 100644 --- a/stubs/protobuf/google/protobuf/service.pyi +++ b/stubs/protobuf/google/protobuf/service.pyi @@ -1,5 +1,6 @@ +from collections.abc import Callable from concurrent.futures import Future -from typing import Callable, Text +from typing import Text from google.protobuf.descriptor import MethodDescriptor, ServiceDescriptor from google.protobuf.message import Message diff --git a/stubs/protobuf/google/protobuf/symbol_database.pyi b/stubs/protobuf/google/protobuf/symbol_database.pyi index 73edfe239..828138d66 100644 --- a/stubs/protobuf/google/protobuf/symbol_database.pyi +++ b/stubs/protobuf/google/protobuf/symbol_database.pyi @@ -1,4 +1,4 @@ -from typing import Iterable +from collections.abc import Iterable from google.protobuf.descriptor import Descriptor, EnumDescriptor, FileDescriptor, ServiceDescriptor from google.protobuf.message import Message diff --git a/stubs/protobuf/google/protobuf/text_format.pyi b/stubs/protobuf/google/protobuf/text_format.pyi index e2ce22d47..a62ffd1fc 100644 --- a/stubs/protobuf/google/protobuf/text_format.pyi +++ b/stubs/protobuf/google/protobuf/text_format.pyi @@ -1,5 +1,6 @@ from _typeshed import SupportsWrite -from typing import Any, Callable, Iterable, Text, TypeVar +from collections.abc import Callable, Iterable +from typing import Any, Text, TypeVar from typing_extensions import TypeAlias from .descriptor import FieldDescriptor diff --git a/stubs/psutil/psutil/__init__.pyi b/stubs/psutil/psutil/__init__.pyi index 74a8554dd..c8df27ad5 100644 --- a/stubs/psutil/psutil/__init__.pyi +++ b/stubs/psutil/psutil/__init__.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import Self +from collections.abc import Callable, Iterable, Iterator from contextlib import AbstractContextManager -from typing import Any, Callable, Iterable, Iterator +from typing import Any from ._common import ( AIX as AIX, diff --git a/stubs/psutil/psutil/_common.pyi b/stubs/psutil/psutil/_common.pyi index 00377d538..9c854e732 100644 --- a/stubs/psutil/psutil/_common.pyi +++ b/stubs/psutil/psutil/_common.pyi @@ -1,7 +1,8 @@ import enum from _typeshed import StrOrBytesPath, SupportsWrite +from collections.abc import Callable from socket import AddressFamily, SocketKind -from typing import Any, Callable, NamedTuple, TypeVar, overload +from typing import Any, NamedTuple, TypeVar, overload from typing_extensions import Literal, TypeAlias POSIX: bool diff --git a/stubs/pyOpenSSL/OpenSSL/SSL.pyi b/stubs/pyOpenSSL/OpenSSL/SSL.pyi index 46e723918..d1a2a404f 100644 --- a/stubs/pyOpenSSL/OpenSSL/SSL.pyi +++ b/stubs/pyOpenSSL/OpenSSL/SSL.pyi @@ -1,5 +1,6 @@ import socket -from typing import Any, Callable, Sequence +from collections.abc import Callable, Sequence +from typing import Any from OpenSSL.crypto import X509, PKey diff --git a/stubs/pyOpenSSL/OpenSSL/crypto.pyi b/stubs/pyOpenSSL/OpenSSL/crypto.pyi index b14f39c98..e8452ec75 100644 --- a/stubs/pyOpenSSL/OpenSSL/crypto.pyi +++ b/stubs/pyOpenSSL/OpenSSL/crypto.pyi @@ -1,6 +1,7 @@ from _typeshed import StrOrBytesPath +from collections.abc import Callable, Iterable, Sequence from datetime import datetime -from typing import Any, Callable, Iterable, Sequence +from typing import Any from typing_extensions import TypeAlias from cryptography.hazmat.primitives.asymmetric.dsa import DSAPrivateKey, DSAPublicKey diff --git a/stubs/pysftp/pysftp/__init__.pyi b/stubs/pysftp/pysftp/__init__.pyi index 35d29e989..8b5b7aacd 100644 --- a/stubs/pysftp/pysftp/__init__.pyi +++ b/stubs/pysftp/pysftp/__init__.pyi @@ -1,8 +1,9 @@ from _typeshed import Self +from collections.abc import Callable, Sequence from contextlib import AbstractContextManager from stat import S_IMODE as S_IMODE from types import TracebackType -from typing import IO, Any, Callable, Sequence +from typing import IO, Any from typing_extensions import Literal, TypeAlias import paramiko diff --git a/stubs/pytest-lazy-fixture/pytest_lazyfixture.pyi b/stubs/pytest-lazy-fixture/pytest_lazyfixture.pyi index b5cc42079..bcbf329c0 100644 --- a/stubs/pytest-lazy-fixture/pytest_lazyfixture.pyi +++ b/stubs/pytest-lazy-fixture/pytest_lazyfixture.pyi @@ -1,4 +1,5 @@ -from typing import Any, Iterable, overload +from collections.abc import Iterable +from typing import Any, overload class LazyFixture: name: str diff --git a/stubs/python-slugify/slugify/slugify.pyi b/stubs/python-slugify/slugify/slugify.pyi index 1a3ef13cd..0f4800b30 100644 --- a/stubs/python-slugify/slugify/slugify.pyi +++ b/stubs/python-slugify/slugify/slugify.pyi @@ -1,4 +1,4 @@ -from typing import Iterable +from collections.abc import Iterable def smart_truncate( string: str, max_length: int = ..., word_boundary: bool = ..., separator: str = ..., save_order: bool = ... diff --git a/stubs/python-slugify/slugify/special.pyi b/stubs/python-slugify/slugify/special.pyi index 29ca15bda..2d1da58e8 100644 --- a/stubs/python-slugify/slugify/special.pyi +++ b/stubs/python-slugify/slugify/special.pyi @@ -1,4 +1,4 @@ -from typing import Sequence +from collections.abc import Sequence def add_uppercase_char(char_list: Sequence[tuple[str, str]]) -> Sequence[tuple[str, str]]: ... diff --git a/stubs/redis/redis/client.pyi b/stubs/redis/redis/client.pyi index 4cb799367..95db74b5f 100644 --- a/stubs/redis/redis/client.pyi +++ b/stubs/redis/redis/client.pyi @@ -1,8 +1,9 @@ import threading from _typeshed import Self, SupportsItems +from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence from datetime import datetime, timedelta from types import TracebackType -from typing import Any, Callable, ClassVar, Generic, Iterable, Iterator, Mapping, Pattern, Sequence, TypeVar, overload +from typing import Any, ClassVar, Generic, Pattern, TypeVar, overload from typing_extensions import Literal, TypeAlias from .commands import CoreCommands, RedisModuleCommands, SentinelCommands diff --git a/stubs/redis/redis/connection.pyi b/stubs/redis/redis/connection.pyi index b8e466f8c..6ed86d6f5 100644 --- a/stubs/redis/redis/connection.pyi +++ b/stubs/redis/redis/connection.pyi @@ -1,5 +1,6 @@ from _typeshed import Self -from typing import Any, Mapping +from collections.abc import Mapping +from typing import Any from .retry import Retry diff --git a/stubs/regex/regex/_regex.pyi b/stubs/regex/regex/_regex.pyi index ee5445fd7..255ac7354 100644 --- a/stubs/regex/regex/_regex.pyi +++ b/stubs/regex/regex/_regex.pyi @@ -1,5 +1,6 @@ from _typeshed import Self -from typing import Any, AnyStr, Callable, Generic, Mapping, TypeVar, overload +from collections.abc import Callable, Mapping +from typing import Any, AnyStr, Generic, TypeVar, overload from typing_extensions import Literal, final _T = TypeVar("_T") diff --git a/stubs/regex/regex/regex.pyi b/stubs/regex/regex/regex.pyi index a8bfd3bbe..547dee6bd 100644 --- a/stubs/regex/regex/regex.pyi +++ b/stubs/regex/regex/regex.pyi @@ -1,4 +1,5 @@ -from typing import Any, AnyStr, Callable, overload +from collections.abc import Callable +from typing import Any, AnyStr, overload from . import _regex from ._regex_core import * diff --git a/stubs/requests/requests/adapters.pyi b/stubs/requests/requests/adapters.pyi index dcb9ba5b7..1084f3881 100644 --- a/stubs/requests/requests/adapters.pyi +++ b/stubs/requests/requests/adapters.pyi @@ -1,4 +1,5 @@ -from typing import Any, Mapping +from collections.abc import Mapping +from typing import Any from urllib3 import exceptions as urllib3_exceptions, poolmanager, response from urllib3.util import retry diff --git a/stubs/requests/requests/cookies.pyi b/stubs/requests/requests/cookies.pyi index 673852193..3f022fa1d 100644 --- a/stubs/requests/requests/cookies.pyi +++ b/stubs/requests/requests/cookies.pyi @@ -1,5 +1,6 @@ import sys -from typing import Any, MutableMapping +from collections.abc import MutableMapping +from typing import Any if sys.version_info >= (3, 0): from http.cookiejar import CookieJar diff --git a/stubs/requests/requests/models.pyi b/stubs/requests/requests/models.pyi index 396fdf477..38fb47453 100644 --- a/stubs/requests/requests/models.pyi +++ b/stubs/requests/requests/models.pyi @@ -1,7 +1,8 @@ import datetime from _typeshed import Self +from collections.abc import Callable, Iterator from json import JSONDecoder -from typing import Any, Callable, Iterator, TypeVar +from typing import Any, TypeVar from urllib3 import exceptions as urllib3_exceptions, fields, filepost, util diff --git a/stubs/requests/requests/sessions.pyi b/stubs/requests/requests/sessions.pyi index ece5d9233..b74705972 100644 --- a/stubs/requests/requests/sessions.pyi +++ b/stubs/requests/requests/sessions.pyi @@ -1,5 +1,6 @@ from _typeshed import Self, SupportsItems -from typing import IO, Any, Callable, Iterable, Mapping, MutableMapping, Union +from collections.abc import Callable, Iterable, Mapping, MutableMapping +from typing import IO, Any, Union from typing_extensions import TypeAlias from urllib3._collections import RecentlyUsedContainer diff --git a/stubs/requests/requests/structures.pyi b/stubs/requests/requests/structures.pyi index 93e343f9b..4e519ac96 100644 --- a/stubs/requests/requests/structures.pyi +++ b/stubs/requests/requests/structures.pyi @@ -1,4 +1,5 @@ -from typing import Any, Generic, Iterable, Iterator, Mapping, MutableMapping, TypeVar +from collections.abc import Iterable, Iterator, Mapping, MutableMapping +from typing import Any, Generic, TypeVar _VT = TypeVar("_VT") diff --git a/stubs/requests/requests/utils.pyi b/stubs/requests/requests/utils.pyi index ab19ef925..51e0563a6 100644 --- a/stubs/requests/requests/utils.pyi +++ b/stubs/requests/requests/utils.pyi @@ -1,4 +1,5 @@ -from typing import Any, AnyStr, Iterable, Mapping +from collections.abc import Iterable, Mapping +from typing import Any, AnyStr from . import compat, cookies, exceptions, structures diff --git a/stubs/setuptools/pkg_resources/__init__.pyi b/stubs/setuptools/pkg_resources/__init__.pyi index 6e4da0afd..1e5174374 100644 --- a/stubs/setuptools/pkg_resources/__init__.pyi +++ b/stubs/setuptools/pkg_resources/__init__.pyi @@ -3,7 +3,8 @@ import types import zipimport from _typeshed import Self from abc import ABCMeta -from typing import IO, Any, Callable, Generator, Iterable, Sequence, TypeVar, overload +from collections.abc import Callable, Generator, Iterable, Sequence +from typing import IO, Any, TypeVar, overload from typing_extensions import TypeAlias LegacyVersion: TypeAlias = Any # from packaging.version diff --git a/stubs/setuptools/setuptools/command/test.pyi b/stubs/setuptools/setuptools/command/test.pyi index 8d0309ab0..a905fc1c5 100644 --- a/stubs/setuptools/setuptools/command/test.pyi +++ b/stubs/setuptools/setuptools/command/test.pyi @@ -1,6 +1,7 @@ from _typeshed import Self +from collections.abc import Callable from types import ModuleType -from typing import Any, Callable, Generic, TypeVar, overload +from typing import Any, Generic, TypeVar, overload from unittest import TestLoader, TestSuite from setuptools import Command diff --git a/stubs/toposort/toposort.pyi b/stubs/toposort/toposort.pyi index ccde29046..76af53134 100644 --- a/stubs/toposort/toposort.pyi +++ b/stubs/toposort/toposort.pyi @@ -1,5 +1,6 @@ from _typeshed import SupportsItems -from typing import Any, Iterable, Iterator, Protocol, TypeVar +from collections.abc import Iterable, Iterator +from typing import Any, Protocol, TypeVar _KT_co = TypeVar("_KT_co", covariant=True) _VT_co = TypeVar("_VT_co", covariant=True) diff --git a/stubs/typed-ast/typed_ast/ast27.pyi b/stubs/typed-ast/typed_ast/ast27.pyi index f7758e881..d4422336a 100644 --- a/stubs/typed-ast/typed_ast/ast27.pyi +++ b/stubs/typed-ast/typed_ast/ast27.pyi @@ -1,4 +1,5 @@ -from typing import Any, Iterator +from collections.abc import Iterator +from typing import Any class NodeVisitor: def visit(self, node: AST) -> Any: ... diff --git a/stubs/typed-ast/typed_ast/ast3.pyi b/stubs/typed-ast/typed_ast/ast3.pyi index 996b07904..e382de299 100644 --- a/stubs/typed-ast/typed_ast/ast3.pyi +++ b/stubs/typed-ast/typed_ast/ast3.pyi @@ -1,4 +1,5 @@ -from typing import Any, Iterator +from collections.abc import Iterator +from typing import Any class NodeVisitor: def visit(self, node: AST) -> Any: ... diff --git a/stubs/urllib3/urllib3/_collections.pyi b/stubs/urllib3/urllib3/_collections.pyi index 15aca7bd6..27366cca4 100644 --- a/stubs/urllib3/urllib3/_collections.pyi +++ b/stubs/urllib3/urllib3/_collections.pyi @@ -1,4 +1,5 @@ -from typing import Any, MutableMapping, NoReturn, TypeVar +from collections.abc import MutableMapping +from typing import Any, NoReturn, TypeVar _KT = TypeVar("_KT") _VT = TypeVar("_VT") diff --git a/stubs/urllib3/urllib3/connection.pyi b/stubs/urllib3/urllib3/connection.pyi index d17829a54..280d1adb1 100644 --- a/stubs/urllib3/urllib3/connection.pyi +++ b/stubs/urllib3/urllib3/connection.pyi @@ -1,6 +1,7 @@ import ssl import sys -from typing import IO, Any, Iterable +from collections.abc import Iterable +from typing import IO, Any from typing_extensions import TypeAlias from . import exceptions, util diff --git a/stubs/urllib3/urllib3/response.pyi b/stubs/urllib3/urllib3/response.pyi index ff63225cc..cc7661c7d 100644 --- a/stubs/urllib3/urllib3/response.pyi +++ b/stubs/urllib3/urllib3/response.pyi @@ -1,7 +1,8 @@ import io from _typeshed import Self +from collections.abc import Iterator, Mapping from http.client import HTTPMessage as _HttplibHTTPMessage, HTTPResponse as _HttplibHTTPResponse -from typing import Any, Iterator, Mapping +from typing import Any from typing_extensions import Literal from urllib3.connectionpool import HTTPConnection diff --git a/stubs/urllib3/urllib3/util/retry.pyi b/stubs/urllib3/urllib3/util/retry.pyi index 9a6883ed9..bd1a5ff44 100644 --- a/stubs/urllib3/urllib3/util/retry.pyi +++ b/stubs/urllib3/urllib3/util/retry.pyi @@ -1,7 +1,8 @@ import logging from _typeshed import Self +from collections.abc import Collection from types import TracebackType -from typing import Any, ClassVar, Collection, NamedTuple +from typing import Any, ClassVar, NamedTuple from typing_extensions import Literal from .. import exceptions diff --git a/stubs/vobject/vobject/base.pyi b/stubs/vobject/vobject/base.pyi index 98407fc43..165a608da 100644 --- a/stubs/vobject/vobject/base.pyi +++ b/stubs/vobject/vobject/base.pyi @@ -1,6 +1,6 @@ from _typeshed import SupportsWrite -from collections.abc import Iterable -from typing import Any, Iterator, TypeVar, overload +from collections.abc import Iterable, Iterator +from typing import Any, TypeVar, overload from typing_extensions import Literal DEBUG: bool diff --git a/stubs/waitress/waitress/adjustments.pyi b/stubs/waitress/waitress/adjustments.pyi index 9a62dd85d..433f79564 100644 --- a/stubs/waitress/waitress/adjustments.pyi +++ b/stubs/waitress/waitress/adjustments.pyi @@ -1,5 +1,6 @@ +from collections.abc import Iterable, Sequence from socket import socket -from typing import Any, Iterable, Sequence +from typing import Any from .compat import HAS_IPV6 as HAS_IPV6, PY2 as PY2, WIN as WIN, string_types as string_types from .proxy_headers import PROXY_HEADERS as PROXY_HEADERS diff --git a/stubs/waitress/waitress/buffers.pyi b/stubs/waitress/waitress/buffers.pyi index 128b1cef4..0babddaef 100644 --- a/stubs/waitress/waitress/buffers.pyi +++ b/stubs/waitress/waitress/buffers.pyi @@ -1,5 +1,6 @@ +from collections.abc import Callable from io import BufferedIOBase, BufferedRandom, BytesIO -from typing import Any, Callable +from typing import Any COPY_BYTES: int STRBUF_LIMIT: int diff --git a/stubs/waitress/waitress/channel.pyi b/stubs/waitress/waitress/channel.pyi index eee8c317c..d14dff869 100644 --- a/stubs/waitress/waitress/channel.pyi +++ b/stubs/waitress/waitress/channel.pyi @@ -1,6 +1,6 @@ +from collections.abc import Mapping, Sequence from socket import socket from threading import Condition, Lock -from typing import Mapping, Sequence from waitress.adjustments import Adjustments from waitress.buffers import OverflowableBuffer diff --git a/stubs/waitress/waitress/parser.pyi b/stubs/waitress/waitress/parser.pyi index 193c4a973..1211c4bb0 100644 --- a/stubs/waitress/waitress/parser.pyi +++ b/stubs/waitress/waitress/parser.pyi @@ -1,5 +1,6 @@ +from collections.abc import Mapping, Sequence from io import BytesIO -from typing import Any, Mapping, Pattern, Sequence +from typing import Any, Pattern from waitress.adjustments import Adjustments from waitress.receiver import ChunkedReceiver, FixedStreamReceiver diff --git a/stubs/waitress/waitress/proxy_headers.pyi b/stubs/waitress/waitress/proxy_headers.pyi index 3d3c6e1d8..d5b774539 100644 --- a/stubs/waitress/waitress/proxy_headers.pyi +++ b/stubs/waitress/waitress/proxy_headers.pyi @@ -1,5 +1,6 @@ +from collections.abc import Callable, Mapping, Sequence from logging import Logger -from typing import Any, Callable, Mapping, NamedTuple, Sequence +from typing import Any, NamedTuple from .utilities import BadRequest as BadRequest diff --git a/stubs/waitress/waitress/runner.pyi b/stubs/waitress/waitress/runner.pyi index 9ce1156c3..6967c6ebb 100644 --- a/stubs/waitress/waitress/runner.pyi +++ b/stubs/waitress/waitress/runner.pyi @@ -1,5 +1,6 @@ +from collections.abc import Callable, Sequence from io import TextIOWrapper -from typing import Any, Callable, Pattern, Sequence +from typing import Any, Pattern HELP: str RUNNER_PATTERN: Pattern[Any] diff --git a/stubs/waitress/waitress/server.pyi b/stubs/waitress/waitress/server.pyi index 8179b6743..e8cb00ae2 100644 --- a/stubs/waitress/waitress/server.pyi +++ b/stubs/waitress/waitress/server.pyi @@ -1,5 +1,6 @@ +from collections.abc import Sequence from socket import socket -from typing import Any, Sequence +from typing import Any from waitress.adjustments import Adjustments from waitress.channel import HTTPChannel diff --git a/stubs/waitress/waitress/task.pyi b/stubs/waitress/waitress/task.pyi index d7a17d6bb..cb8e67591 100644 --- a/stubs/waitress/waitress/task.pyi +++ b/stubs/waitress/waitress/task.pyi @@ -1,7 +1,8 @@ from collections import deque +from collections.abc import Mapping, Sequence from logging import Logger from threading import Condition, Lock -from typing import Any, Mapping, Sequence +from typing import Any from .channel import HTTPChannel from .utilities import Error diff --git a/stubs/waitress/waitress/trigger.pyi b/stubs/waitress/waitress/trigger.pyi index 8196dbbfa..58cf30f23 100644 --- a/stubs/waitress/waitress/trigger.pyi +++ b/stubs/waitress/waitress/trigger.pyi @@ -1,7 +1,7 @@ import sys +from collections.abc import Callable, Mapping from socket import socket from threading import Lock -from typing import Callable, Mapping from typing_extensions import Literal from . import wasyncore as wasyncore diff --git a/stubs/waitress/waitress/utilities.pyi b/stubs/waitress/waitress/utilities.pyi index 9f7482b51..f8ebc1135 100644 --- a/stubs/waitress/waitress/utilities.pyi +++ b/stubs/waitress/waitress/utilities.pyi @@ -1,5 +1,6 @@ +from collections.abc import Callable, Mapping, Sequence from logging import Logger -from typing import Any, Callable, Mapping, Match, Pattern, Sequence +from typing import Any, Match, Pattern from .rfc7230 import OBS_TEXT as OBS_TEXT, VCHAR as VCHAR diff --git a/stubs/waitress/waitress/wasyncore.pyi b/stubs/waitress/waitress/wasyncore.pyi index b7bb0b5d8..1aeef2410 100644 --- a/stubs/waitress/waitress/wasyncore.pyi +++ b/stubs/waitress/waitress/wasyncore.pyi @@ -1,7 +1,8 @@ +from collections.abc import Callable, Mapping from io import BytesIO from logging import Logger from socket import socket -from typing import Any, Callable, Mapping +from typing import Any from . import compat as compat, utilities as utilities diff --git a/stubs/xmltodict/xmltodict.pyi b/stubs/xmltodict/xmltodict.pyi index 68ff491ff..9d310957a 100644 --- a/stubs/xmltodict/xmltodict.pyi +++ b/stubs/xmltodict/xmltodict.pyi @@ -1,6 +1,7 @@ from _typeshed import SupportsRead, SupportsWrite from collections import OrderedDict -from typing import Any, Mapping, overload +from collections.abc import Mapping +from typing import Any, overload class ParsingInterrupted(Exception): ...