Enable pyright for all Python 3 stubs (#5597)

* pyright: disable reportUnknownParameterType

Unknown parameter types are preferred over Any annotations for
incomplete stubs. Especially larger stubs are expected to be
incomplete for some time and it would be a shame to lose the
other pyright warnings for those stubs.

* Also disable reportUnknownVariableType

Fix problems with tkinter

* Disable reportUnknownMemberType

Fix pyright problems

stubs/Jinja2/jinja2/utils.pyi

@@ -10,15 +10,15 @@ concat: Any
 
 _CallableT = TypeVar("_CallableT", bound=Callable[..., Any])
 
-class _ContextFunction(Protocol[_CallableT]):
+class _ContextFunction(Protocol[_CallableT]):  # type: ignore
     contextfunction: Literal[True]
     __call__: _CallableT
 
-class _EvalContextFunction(Protocol[_CallableT]):
+class _EvalContextFunction(Protocol[_CallableT]):  # type: ignore
     evalcontextfunction: Literal[True]
     __call__: _CallableT
 
-class _EnvironmentFunction(Protocol[_CallableT]):
+class _EnvironmentFunction(Protocol[_CallableT]):  # type: ignore
     environmentfunction: Literal[True]
     __call__: _CallableT
 

stubs/Markdown/markdown/blockparser.pyi

@@ -1,6 +1,6 @@
-from typing import Any
+from typing import Any, List
 
-class State(list):
+class State(List[Any]):
     def set(self, state) -> None: ...
     def reset(self) -> None: ...
     def isstate(self, state): ...

stubs/Markdown/markdown/blockprocessors.pyi

@@ -17,7 +17,7 @@ class BlockProcessor:
 class ListIndentProcessor(BlockProcessor):
     ITEM_TYPES: Any
     LIST_TYPES: Any
-    INDENT_RE: Pattern
+    INDENT_RE: Pattern[str]
     def __init__(self, *args) -> None: ...
     def create_item(self, parent, block) -> None: ...
     def get_level(self, parent, block): ...
@@ -25,7 +25,7 @@ class ListIndentProcessor(BlockProcessor):
 class CodeBlockProcessor(BlockProcessor): ...
 
 class BlockQuoteProcessor(BlockProcessor):
-    RE: Pattern
+    RE: Pattern[str]
     def clean(self, line): ...
 
 class OListProcessor(BlockProcessor):
@@ -33,26 +33,26 @@ class OListProcessor(BlockProcessor):
     STARTSWITH: str = ...
     LAZY_OL: bool = ...
     SIBLING_TAGS: Any
-    RE: Pattern
-    CHILD_RE: Pattern
-    INDENT_RE: Pattern
+    RE: Pattern[str]
+    CHILD_RE: Pattern[str]
+    INDENT_RE: Pattern[str]
     def __init__(self, parser) -> None: ...
     def get_items(self, block): ...
 
 class UListProcessor(OListProcessor):
     TAG: str = ...
-    RE: Pattern
+    RE: Pattern[str]
     def __init__(self, parser) -> None: ...
 
 class HashHeaderProcessor(BlockProcessor):
-    RE: Pattern
+    RE: Pattern[str]
 
 class SetextHeaderProcessor(BlockProcessor):
-    RE: Pattern
+    RE: Pattern[str]
 
 class HRProcessor(BlockProcessor):
     RE: str = ...
-    SEARCH_RE: Pattern
+    SEARCH_RE: Pattern[str]
     match: Any
 
 class EmptyBlockProcessor(BlockProcessor): ...

stubs/Markdown/markdown/extensions/abbr.pyi

@@ -4,7 +4,7 @@ from markdown.blockprocessors import BlockProcessor
 from markdown.extensions import Extension
 from markdown.inlinepatterns import InlineProcessor
 
-ABBR_REF_RE: Pattern
+ABBR_REF_RE: Pattern[str]
 
 class AbbrExtension(Extension): ...
 class AbbrPreprocessor(BlockProcessor): ...

stubs/Markdown/markdown/extensions/admonition.pyi

@@ -6,9 +6,9 @@ from markdown.extensions import Extension
 class AdmonitionExtension(Extension): ...
 
 class AdmonitionProcessor(BlockProcessor):
-    CLASSNAME: str = ...
-    CLASSNAME_TITLE: str = ...
-    RE: Pattern
+    CLASSNAME: str
+    CLASSNAME_TITLE: str
+    RE: Pattern[str]
     RE_SPACES: Any
     def get_class_and_title(self, match): ...
 

stubs/Markdown/markdown/extensions/attr_list.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Pattern
+from typing import Pattern
 
 from markdown.extensions import Extension
 from markdown.treeprocessors import Treeprocessor
@@ -7,11 +7,11 @@ def get_attrs(str): ...
 def isheader(elem): ...
 
 class AttrListTreeprocessor(Treeprocessor):
-    BASE_RE: str = ...
-    HEADER_RE: Pattern
-    BLOCK_RE: Pattern
-    INLINE_RE: Pattern
-    NAME_RE: Pattern
+    BASE_RE: str
+    HEADER_RE: Pattern[str]
+    BLOCK_RE: Pattern[str]
+    INLINE_RE: Pattern[str]
+    NAME_RE: Pattern[str]
     def assign_attrs(self, elem, attrs) -> None: ...
     def sanitize_name(self, name): ...
 

stubs/Markdown/markdown/extensions/def_list.pyi

@@ -1,11 +1,11 @@
-from typing import Any, Pattern
+from typing import Pattern
 
 from markdown.blockprocessors import BlockProcessor, ListIndentProcessor
 from markdown.extensions import Extension
 
 class DefListProcessor(BlockProcessor):
-    RE: Pattern
-    NO_INDENT_RE: Pattern
+    RE: Pattern[str]
+    NO_INDENT_RE: Pattern[str]
 
 class DefListIndentProcessor(ListIndentProcessor): ...
 class DefListExtension(Extension): ...

stubs/Markdown/markdown/extensions/fenced_code.pyi

@@ -6,7 +6,7 @@ from markdown.preprocessors import Preprocessor
 class FencedCodeExtension(Extension): ...
 
 class FencedBlockPreprocessor(Preprocessor):
-    FENCED_BLOCK_RE: Pattern
+    FENCED_BLOCK_RE: Pattern[str]
     CODE_WRAP: str = ...
     LANG_TAG: str = ...
     checked_for_codehilite: bool = ...

stubs/Markdown/markdown/extensions/footnotes.pyi

@@ -8,8 +8,8 @@ from markdown.treeprocessors import Treeprocessor
 
 FN_BACKLINK_TEXT: Any
 NBSP_PLACEHOLDER: Any
-DEF_RE: Pattern
-TABBED_RE: Pattern
+DEF_RE: Pattern[str]
+TABBED_RE: Pattern[str]
 RE_REF_ID: Any
 
 class FootnoteExtension(Extension):

stubs/Markdown/markdown/extensions/legacy_attrs.pyi

@@ -1,9 +1,9 @@
-from typing import Any, Pattern
+from typing import Pattern
 
 from markdown.extensions import Extension
 from markdown.treeprocessors import Treeprocessor
 
-ATTR_RE: Pattern
+ATTR_RE: Pattern[str]
 
 class LegacyAttrs(Treeprocessor):
     def handleAttributes(self, el, txt): ...

stubs/Markdown/markdown/extensions/legacy_em.pyi

@@ -1,5 +1,3 @@
-from typing import Any
-
 from markdown.extensions import Extension
 from markdown.inlinepatterns import UnderscoreProcessor
 

stubs/Markdown/markdown/extensions/md_in_html.pyi

@@ -1,5 +1,3 @@
-from typing import Any, Optional
-
 from markdown.blockprocessors import BlockProcessor
 from markdown.extensions import Extension
 

stubs/Markdown/markdown/extensions/meta.pyi

@@ -4,10 +4,10 @@ from markdown.extensions import Extension
 from markdown.preprocessors import Preprocessor
 
 log: Any
-META_RE: Pattern
-META_MORE_RE: Pattern
-BEGIN_RE: Pattern
-END_RE: Pattern
+META_RE: Pattern[str]
+META_MORE_RE: Pattern[str]
+BEGIN_RE: Pattern[str]
+END_RE: Pattern[str]
 
 class MetaExtension(Extension):
     md: Any

stubs/Markdown/markdown/extensions/nl2br.pyi

@@ -1,5 +1,3 @@
-from typing import Any
-
 from markdown.extensions import Extension
 
 BR_RE: str

stubs/Markdown/markdown/extensions/sane_lists.pyi

@@ -1,5 +1,3 @@
-from typing import Any, Pattern
-
 from markdown.blockprocessors import OListProcessor, UListProcessor
 from markdown.extensions import Extension
 

stubs/Markdown/markdown/extensions/smarty.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Pattern
+from typing import Any
 
 from markdown.extensions import Extension
 from markdown.inlinepatterns import HtmlInlineProcessor

stubs/Markdown/markdown/extensions/toc.pyi

@@ -5,7 +5,7 @@ from markdown.treeprocessors import Treeprocessor
 
 def slugify(value, separator): ...
 
-IDCOUNT_RE: Pattern
+IDCOUNT_RE: Pattern[str]
 
 def unique(id, ids): ...
 def get_name(el): ...

stubs/Markdown/markdown/inlinepatterns.pyi

@@ -40,14 +40,14 @@ class Pattern:
     @property
     def markdown(self): ...
     def getCompiledRegExp(self): ...
-    def handleMatch(self, m: Match) -> Optional[Union[str, Element]]: ...
+    def handleMatch(self, m: Match[str]) -> Optional[Union[str, Element]]: ...
     def type(self): ...
     def unescape(self, text): ...
 
 class InlineProcessor(Pattern):
     safe_mode: bool = ...
     def __init__(self, pattern, md: Optional[Any] = ...) -> None: ...
-    def handleMatch(self, m: Match, data) -> Union[Tuple[Element, int, int], Tuple[None, None, None]]: ...  # type: ignore
+    def handleMatch(self, m: Match[str], data) -> Union[Tuple[Element, int, int], Tuple[None, None, None]]: ...  # type: ignore
 
 class SimpleTextPattern(Pattern): ...
 class SimpleTextInlineProcessor(InlineProcessor): ...

stubs/Markdown/markdown/pep562.pyi

@@ -1,5 +1,3 @@
-from typing import Any
-
 class Version:
     def __new__(cls, major, minor, micro, release: str = ..., pre: int = ..., post: int = ..., dev: int = ...): ...
 

stubs/Markdown/markdown/postprocessors.pyi

@@ -13,5 +13,5 @@ class RawHtmlPostprocessor(Postprocessor):
 class AndSubstitutePostprocessor(Postprocessor): ...
 
 class UnescapePostprocessor(Postprocessor):
-    RE: Pattern
+    RE: Pattern[str]
     def unescape(self, m): ...

stubs/Markdown/markdown/preprocessors.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Iterable, List, Pattern
+from typing import Any, List, Pattern
 
 from . import util
 
@@ -19,5 +19,5 @@ class HtmlBlockPreprocessor(Preprocessor):
 
 class ReferencePreprocessor(Preprocessor):
     TITLE: str = ...
-    RE: Pattern
-    TITLE_RE: Pattern
+    RE: Pattern[str]
+    TITLE_RE: Pattern[str]

stubs/Markdown/markdown/serializers.pyi

@@ -1,4 +1,2 @@
-from typing import Any
-
 def to_html_string(element): ...
 def to_xhtml_string(element): ...

stubs/Markdown/markdown/util.pyi

@@ -1,4 +1,3 @@
-from collections import namedtuple
 from typing import Any, Optional, Pattern
 
 PY37: Any
@@ -8,10 +7,10 @@ STX: str
 ETX: str
 INLINE_PLACEHOLDER_PREFIX: Any
 INLINE_PLACEHOLDER: Any
-INLINE_PLACEHOLDER_RE: Pattern
+INLINE_PLACEHOLDER_RE: Pattern[str]
 AMP_SUBSTITUTE: Any
 HTML_PLACEHOLDER: Any
-HTML_PLACEHOLDER_RE: Pattern
+HTML_PLACEHOLDER_RE: Pattern[str]
 TAG_PLACEHOLDER: Any
 INSTALLED_EXTENSIONS: Any
 RTL_BIDI_RANGES: Any

stubs/PyMySQL/pymysql/connections.pyi

@@ -1,4 +1,4 @@
-from socket import socket
+from socket import socket as _socket
 from typing import Any, AnyStr, Mapping, Optional, Tuple, Type
 
 from .charset import charset_by_id as charset_by_id, charset_by_name as charset_by_name
@@ -88,7 +88,7 @@ class Connection:
         cursorclass: Optional[Type[Cursor]] = ...,
         init_command: Optional[Any] = ...,
         connect_timeout: Optional[int] = ...,
-        ssl: Optional[Mapping] = ...,
+        ssl: Mapping[Any, Any] | None = ...,
         read_default_group: Optional[Any] = ...,
         compress: Optional[Any] = ...,
         named_pipe: Optional[Any] = ...,
@@ -98,7 +98,7 @@ class Connection:
         local_infile: Optional[Any] = ...,
         max_allowed_packet: int = ...,
         defer_connect: Optional[bool] = ...,
-        auth_plugin_map: Optional[Mapping] = ...,
+        auth_plugin_map: Mapping[Any, Any] | None = ...,
         read_timeout: Optional[float] = ...,
         write_timeout: Optional[float] = ...,
         bind_address: Optional[Any] = ...,
@@ -118,7 +118,7 @@ class Connection:
     def begin(self) -> None: ...
     def rollback(self) -> None: ...
     def select_db(self, db) -> None: ...
-    def escape(self, obj, mapping: Optional[Mapping] = ...): ...
+    def escape(self, obj, mapping: Mapping[Any, Any] | None = ...): ...
     def literal(self, obj): ...
     def escape_string(self, s: AnyStr) -> AnyStr: ...
     def cursor(self, cursor: Optional[Type[Cursor]] = ...) -> Cursor: ...
@@ -128,7 +128,7 @@ class Connection:
     def kill(self, thread_id): ...
     def ping(self, reconnect: bool = ...) -> None: ...
     def set_charset(self, charset) -> None: ...
-    def connect(self, sock: Optional[socket] = ...) -> None: ...
+    def connect(self, sock: Optional[_socket] = ...) -> None: ...
     def write_packet(self, payload) -> None: ...
     def _read_packet(self, packet_type=...): ...
     def insert_id(self): ...

stubs/PyYAML/yaml/composer.pyi

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Optional
 
 from yaml.error import MarkedYAMLError
 from yaml.nodes import MappingNode, Node, ScalarNode, SequenceNode

stubs/cryptography/cryptography/hazmat/primitives/serialization/__init__.pyi

@@ -9,11 +9,6 @@ from cryptography.hazmat.backends.interfaces import (
     PEMSerializationBackend,
     RSABackend,
 )
-from cryptography.hazmat.primitives.asymmetric.dh import DHPrivateKey, DHPublicKey
-from cryptography.hazmat.primitives.asymmetric.dsa import DSAPrivateKey, DSAPublicKey
-from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurvePrivateKey, EllipticCurvePublicKey
-from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey
-from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey, RSAPublicKey
 
 def load_pem_private_key(
     data: bytes, password: Optional[bytes], backend: Optional[PEMSerializationBackend] = ...

stubs/docutils/docutils/__init__.pyi

@@ -1,5 +1,4 @@
-from collections.abc import Sequence
-from typing import Any, ClassVar, NamedTuple, Optional, Tuple, Union
+from typing import Any, ClassVar, NamedTuple, Optional, Tuple
 
 __docformat__: str
 __version__: str

stubs/docutils/docutils/utils/__init__.pyi

@@ -3,8 +3,10 @@ from typing import Any, Optional
 
 from docutils.io import FileOutput
 
+_list = list
+
 class DependencyList:
-    list: list[str]
+    list: _list[str]
     file: Optional[FileOutput]
     def __init__(self, output_file: Optional[str] = ..., dependencies: Iterable[str] = ...) -> None: ...
     def set_output(self, output_file: Optional[str]) -> None: ...

stubs/paramiko/paramiko/_winapi.pyi

@@ -1,97 +1,85 @@
 import builtins
-import ctypes.wintypes
+import ctypes
 import sys
 from types import TracebackType
 from typing import Any, Optional, Type, TypeVar
 
-assert sys.platform == "win32"
+if sys.platform == "win32":
 
-_T = TypeVar("_T")
-
-def format_system_message(errno: int) -> Optional[str]: ...
-
-class WindowsError(builtins.WindowsError):
-    def __init__(self, value: Optional[int] = ...) -> None: ...
-    @property
-    def message(self) -> str: ...
-    @property
-    def code(self) -> int: ...
-
-def handle_nonzero_success(result: int) -> None: ...
-
-GMEM_MOVEABLE: int
-GlobalAlloc: Any
-GlobalLock: Any
-GlobalUnlock: Any
-GlobalSize: Any
-CreateFileMapping: Any
-MapViewOfFile: Any
-UnmapViewOfFile: Any
-RtlMoveMemory: Any
-
-class MemoryMap:
-    name: str
-    length: int
-    security_attributes: Any = ...
-    pos: int
-    filemap: Any = ...
-    view: Any = ...
-    def __init__(self, name: str, length: int, security_attributes: Optional[Any] = ...) -> None: ...
-    def __enter__(self: _T) -> _T: ...
-    def seek(self, pos: int) -> None: ...
-    def write(self, msg: bytes) -> None: ...
-    def read(self, n: int) -> bytes: ...
-    def __exit__(
-        self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], tb: Optional[TracebackType]
-    ) -> None: ...
-
-READ_CONTROL: int
-STANDARD_RIGHTS_REQUIRED: int
-STANDARD_RIGHTS_READ: int
-STANDARD_RIGHTS_WRITE: int
-STANDARD_RIGHTS_EXECUTE: int
-STANDARD_RIGHTS_ALL: int
-POLICY_VIEW_LOCAL_INFORMATION: int
-POLICY_VIEW_AUDIT_INFORMATION: int
-POLICY_GET_PRIVATE_INFORMATION: int
-POLICY_TRUST_ADMIN: int
-POLICY_CREATE_ACCOUNT: int
-POLICY_CREATE_SECRET: int
-POLICY_CREATE_PRIVILEGE: int
-POLICY_SET_DEFAULT_QUOTA_LIMITS: int
-POLICY_SET_AUDIT_REQUIREMENTS: int
-POLICY_AUDIT_LOG_ADMIN: int
-POLICY_SERVER_ADMIN: int
-POLICY_LOOKUP_NAMES: int
-POLICY_NOTIFICATION: int
-POLICY_ALL_ACCESS: int
-POLICY_READ: int
-POLICY_WRITE: int
-POLICY_EXECUTE: int
-
-class TokenAccess:
-    TOKEN_QUERY: int
-
-class TokenInformationClass:
-    TokenUser: int
-
-class TOKEN_USER(ctypes.Structure):
-    num: int
-
-class SECURITY_DESCRIPTOR(ctypes.Structure):
-    SECURITY_DESCRIPTOR_CONTROL: Any
-    REVISION: int
-
-class SECURITY_ATTRIBUTES(ctypes.Structure):
-    nLength: int
-    lpSecurityDescriptor: Any
-    def __init__(self, *args: Any, **kwargs: Any) -> None: ...
-    @property
-    def descriptor(self) -> Any: ...
-    @descriptor.setter
-    def descriptor(self, value: Any) -> None: ...
-
-def GetTokenInformation(token: Any, information_class: Any) -> Any: ...
-def OpenProcessToken(proc_handle: Any, access: Any) -> Any: ...
-def get_current_user() -> TOKEN_USER: ...
-def get_security_attributes_for_user(user: Optional[TOKEN_USER] = ...) -> SECURITY_ATTRIBUTES: ...
+    _T = TypeVar("_T")
+    def format_system_message(errno: int) -> Optional[str]: ...
+    class WindowsError(builtins.WindowsError):
+        def __init__(self, value: Optional[int] = ...) -> None: ...
+        @property
+        def message(self) -> str: ...
+        @property
+        def code(self) -> int: ...
+    def handle_nonzero_success(result: int) -> None: ...
+    GMEM_MOVEABLE: int
+    GlobalAlloc: Any
+    GlobalLock: Any
+    GlobalUnlock: Any
+    GlobalSize: Any
+    CreateFileMapping: Any
+    MapViewOfFile: Any
+    UnmapViewOfFile: Any
+    RtlMoveMemory: Any
+    class MemoryMap:
+        name: str
+        length: int
+        security_attributes: Any = ...
+        pos: int
+        filemap: Any = ...
+        view: Any = ...
+        def __init__(self, name: str, length: int, security_attributes: Optional[Any] = ...) -> None: ...
+        def __enter__(self: _T) -> _T: ...
+        def seek(self, pos: int) -> None: ...
+        def write(self, msg: bytes) -> None: ...
+        def read(self, n: int) -> bytes: ...
+        def __exit__(
+            self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], tb: Optional[TracebackType]
+        ) -> None: ...
+    READ_CONTROL: int
+    STANDARD_RIGHTS_REQUIRED: int
+    STANDARD_RIGHTS_READ: int
+    STANDARD_RIGHTS_WRITE: int
+    STANDARD_RIGHTS_EXECUTE: int
+    STANDARD_RIGHTS_ALL: int
+    POLICY_VIEW_LOCAL_INFORMATION: int
+    POLICY_VIEW_AUDIT_INFORMATION: int
+    POLICY_GET_PRIVATE_INFORMATION: int
+    POLICY_TRUST_ADMIN: int
+    POLICY_CREATE_ACCOUNT: int
+    POLICY_CREATE_SECRET: int
+    POLICY_CREATE_PRIVILEGE: int
+    POLICY_SET_DEFAULT_QUOTA_LIMITS: int
+    POLICY_SET_AUDIT_REQUIREMENTS: int
+    POLICY_AUDIT_LOG_ADMIN: int
+    POLICY_SERVER_ADMIN: int
+    POLICY_LOOKUP_NAMES: int
+    POLICY_NOTIFICATION: int
+    POLICY_ALL_ACCESS: int
+    POLICY_READ: int
+    POLICY_WRITE: int
+    POLICY_EXECUTE: int
+    class TokenAccess:
+        TOKEN_QUERY: int
+    class TokenInformationClass:
+        TokenUser: int
+    class TOKEN_USER(ctypes.Structure):
+        num: int
+    class SECURITY_DESCRIPTOR(ctypes.Structure):
+        SECURITY_DESCRIPTOR_CONTROL: Any
+        REVISION: int
+    class SECURITY_ATTRIBUTES(ctypes.Structure):
+        nLength: int
+        lpSecurityDescriptor: Any
+        def __init__(self, *args: Any, **kwargs: Any) -> None: ...
+        @property
+        def descriptor(self) -> Any: ...
+        @descriptor.setter
+        def descriptor(self, value: Any) -> None: ...
+    def GetTokenInformation(token: Any, information_class: Any) -> Any: ...
+    def OpenProcessToken(proc_handle: Any, access: Any) -> Any: ...
+    def get_current_user() -> TOKEN_USER: ...
+    def get_security_attributes_for_user(user: Optional[TOKEN_USER] = ...) -> SECURITY_ATTRIBUTES: ...

stubs/paramiko/paramiko/auth_handler.pyi

@@ -1,9 +1,7 @@
 from threading import Event
 from typing import Callable, List, Optional, Tuple
 
-from paramiko.message import Message
 from paramiko.pkey import PKey
-from paramiko.server import InteractiveQuery
 from paramiko.ssh_gss import _SSH_GSSAuth
 from paramiko.transport import Transport
 

stubs/paramiko/paramiko/channel.pyi

@@ -2,9 +2,8 @@ from logging import Logger
 from threading import Condition, Event, Lock
 from typing import Any, Callable, Mapping, Optional, Tuple, TypeVar
 
-from paramiko.buffered_pipe import BufferedPipe, PipeTimeout
+from paramiko.buffered_pipe import BufferedPipe
 from paramiko.file import BufferedFile
-from paramiko.message import Message
 from paramiko.transport import Transport
 from paramiko.util import ClosingContextManager
 
@@ -19,8 +18,8 @@ class Channel(ClosingContextManager):
     active: bool
     eof_received: int
     eof_sent: int
-    in_buffer: BufferedPipe
-    in_stderr_buffer: BufferedPipe
+    in_buffer: BufferedPipe[Any]
+    in_stderr_buffer: BufferedPipe[Any]
     timeout: Optional[float]
     closed: bool
     ultra_debug: bool
@@ -89,7 +88,7 @@ class Channel(ClosingContextManager):
     def shutdown_read(self) -> None: ...
     def shutdown_write(self) -> None: ...
 
-class ChannelFile(BufferedFile):
+class ChannelFile(BufferedFile[Any]):
     channel: Channel
     def __init__(self, channel: Channel, mode: str = ..., bufsize: int = ...) -> None: ...
 

stubs/paramiko/paramiko/client.pyi

@@ -1,7 +1,6 @@
 from socket import socket
-from typing import Any, Dict, Iterable, Mapping, NoReturn, Optional, Tuple, Type, Union
+from typing import Dict, Iterable, Mapping, NoReturn, Optional, Tuple, Type, Union
 
-from paramiko.agent import Agent
 from paramiko.channel import Channel, ChannelFile, ChannelStderrFile, ChannelStdinFile
 from paramiko.hostkeys import HostKeys
 from paramiko.pkey import PKey

stubs/paramiko/paramiko/common.pyi

@@ -1,5 +1,5 @@
 import sys
-from typing import Any, Dict, Protocol, Text, Union
+from typing import Dict, Protocol, Text, Union
 
 MSG_DISCONNECT: int
 MSG_IGNORE: int

stubs/paramiko/paramiko/dsskey.pyi

@@ -1,8 +1,7 @@
 from typing import IO, Any, Callable, Optional, Tuple
 
-from paramiko.ber import BER
 from paramiko.message import Message
-from paramiko.pkey import PKey, PublicBlob
+from paramiko.pkey import PKey
 
 class DSSKey(PKey):
     p: Optional[int]

stubs/paramiko/paramiko/ecdsakey.pyi

@@ -1,6 +1,10 @@
 from typing import IO, Any, Callable, List, Optional, Sequence, Tuple, Type
 
-from cryptography.hazmat.primitives.asymmetric.ec2 import EllipticCurve, EllipticCurvePrivateKey, EllipticCurvePublicKey
+from cryptography.hazmat.primitives.asymmetric.ec2 import (  # type: ignore
+    EllipticCurve,
+    EllipticCurvePrivateKey,
+    EllipticCurvePublicKey,
+)
 from cryptography.hazmat.primitives.hashes import HashAlgorithm
 from paramiko.message import Message
 from paramiko.pkey import PKey

stubs/paramiko/paramiko/ed25519key.pyi

@@ -1,4 +1,4 @@
-from typing import IO, Any, Optional
+from typing import IO, Optional
 
 from paramiko.message import Message
 from paramiko.pkey import PKey

stubs/paramiko/paramiko/file.pyi

@@ -1,4 +1,4 @@
-from typing import AnyStr, Generic, Iterable, List, Optional, Tuple, Union
+from typing import Any, AnyStr, Generic, Iterable, List, Optional, Tuple, Union
 
 from paramiko.util import ClosingContextManager
 
@@ -18,7 +18,7 @@ class BufferedFile(ClosingContextManager, Generic[AnyStr]):
     newlines: Union[None, AnyStr, Tuple[AnyStr, ...]]
     def __init__(self) -> None: ...
     def __del__(self) -> None: ...
-    def __iter__(self) -> BufferedFile: ...
+    def __iter__(self) -> BufferedFile[Any]: ...
     def close(self) -> None: ...
     def flush(self) -> None: ...
     def __next__(self) -> AnyStr: ...
@@ -33,6 +33,6 @@ class BufferedFile(ClosingContextManager, Generic[AnyStr]):
     def tell(self) -> int: ...
     def write(self, data: AnyStr) -> None: ...
     def writelines(self, sequence: Iterable[AnyStr]) -> None: ...
-    def xreadlines(self) -> BufferedFile: ...
+    def xreadlines(self) -> BufferedFile[Any]: ...
     @property
     def closed(self) -> bool: ...

stubs/paramiko/paramiko/hostkeys.pyi

@@ -1,4 +1,4 @@
-from typing import Dict, Iterator, List, Mapping, MutableMapping, Optional
+from typing import Iterator, List, Mapping, MutableMapping, Optional
 
 from paramiko.pkey import PKey
 

stubs/paramiko/paramiko/kex_curve25519.pyi

@@ -1,6 +1,6 @@
 import sys
 from _typeshed import ReadableBuffer as ReadableBuffer
-from typing import Any, Callable, Optional
+from typing import Callable, Optional
 
 from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey
 from paramiko.message import Message

stubs/paramiko/paramiko/kex_ecdh_nist.pyi

@@ -2,7 +2,11 @@ import sys
 from _typeshed import ReadableBuffer
 from typing import Callable, Optional, Union
 
-from cryptography.hazmat.primitives.asymmetric.ec2 import EllipticCurve, EllipticCurvePrivateKey, EllipticCurvePublicKey
+from cryptography.hazmat.primitives.asymmetric.ec2 import (  # type: ignore
+    EllipticCurve,
+    EllipticCurvePrivateKey,
+    EllipticCurvePublicKey,
+)
 from paramiko.message import Message
 from paramiko.transport import Transport
 

stubs/paramiko/paramiko/pkey.pyi

@@ -1,4 +1,4 @@
-from typing import IO, Any, Optional, Pattern, Text, Type, TypeVar, Union
+from typing import IO, Optional, Pattern, Type, TypeVar, Union
 
 from paramiko.message import Message
 

stubs/paramiko/paramiko/proxy.pyi

@@ -1,11 +1,11 @@
 from subprocess import Popen
-from typing import List, Optional
+from typing import Any, List, Optional
 
 from paramiko.util import ClosingContextManager
 
 class ProxyCommand(ClosingContextManager):
     cmd: List[str]
-    process: Popen
+    process: Popen[Any]
     timeout: Optional[float]
     def __init__(self, command_line: str) -> None: ...
     def send(self, content: bytes) -> int: ...

stubs/paramiko/paramiko/py3compat.pyi

@@ -5,11 +5,11 @@ _T = TypeVar("_T")
 
 PY2: bool
 
-string_types: Union[Type, Sequence[Type]]
-text_type: Union[Type, Sequence[Type]]
-bytes_types: Union[Type, Sequence[Type]]
+string_types: Union[Type[Any], Sequence[Type[Any]]]
+text_type: Union[Type[Any], Sequence[Type[Any]]]
+bytes_types: Union[Type[Any], Sequence[Type[Any]]]
 bytes = bytes
-integer_types: Union[Type, Sequence[Type]]
+integer_types: Union[Type[Any], Sequence[Type[Any]]]
 long = int
 
 def input(prompt: Any) -> str: ...

stubs/paramiko/paramiko/sftp_file.pyi

@@ -1,11 +1,11 @@
-from typing import Iterator, Optional, Sequence, Tuple
+from typing import Any, Iterator, Optional, Sequence, Tuple
 
 from paramiko.file import BufferedFile
 from paramiko.sftp_attr import SFTPAttributes
 from paramiko.sftp_client import SFTPClient
 from paramiko.sftp_handle import SFTPHandle
 
-class SFTPFile(BufferedFile):
+class SFTPFile(BufferedFile[Any]):
     MAX_REQUEST_SIZE: int
     sftp: SFTPClient
     handle: SFTPHandle

stubs/paramiko/paramiko/sftp_handle.pyi

@@ -1,7 +1,6 @@
 from typing import Union
 
 from paramiko.sftp_attr import SFTPAttributes
-from paramiko.sftp_server import SFTPServer
 from paramiko.util import ClosingContextManager
 
 class SFTPHandle(ClosingContextManager):

stubs/paramiko/paramiko/ssh_gss.pyi

@@ -1,7 +1,5 @@
 from typing import Any, Optional, Tuple, Type
 
-from paramiko.ssh_exception import SSHException
-
 GSS_AUTH_AVAILABLE: bool
 GSS_EXCEPTIONS: Tuple[Type[Exception], ...]
 

stubs/paramiko/paramiko/transport.pyi

@@ -6,11 +6,9 @@ from typing import Any, Callable, Dict, Iterable, List, Optional, Protocol, Sequ
 
 from paramiko.auth_handler import AuthHandler, _InteractiveCallback
 from paramiko.channel import Channel
-from paramiko.compress import ZlibCompressor, ZlibDecompressor
 from paramiko.message import Message
-from paramiko.packet import NeedRekeyException, Packetizer
+from paramiko.packet import Packetizer
 from paramiko.pkey import PKey
-from paramiko.primes import ModulusPack
 from paramiko.server import ServerInterface, SubsystemHandler
 from paramiko.sftp_client import SFTPClient
 from paramiko.ssh_gss import _SSH_GSSAuth

stubs/paramiko/paramiko/util.pyi

@@ -1,7 +1,7 @@
 import sys
 from logging import Logger, LogRecord
 from types import TracebackType
-from typing import IO, AnyStr, Callable, Generic, List, Optional, Protocol, Text, Type, TypeVar, Union
+from typing import IO, AnyStr, Callable, List, Optional, Protocol, Type, TypeVar, Union
 
 from paramiko.config import SSHConfig, SSHConfigDict
 from paramiko.hostkeys import HostKeys
@@ -46,7 +46,7 @@ def constant_time_bytes_eq(a: AnyStr, b: AnyStr) -> bool: ...
 class ClosingContextManager:
     def __enter__(self: _TC) -> _TC: ...
     def __exit__(
-        self: _TC, type: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[TracebackType]
+        self, type: Optional[Type[BaseException]], value: Optional[BaseException], traceback: Optional[TracebackType]
     ) -> None: ...
 
 def clamp_value(minimum: int, val: int, maximum: int) -> int: ...

stubs/paramiko/paramiko/win_pageant.pyi

@@ -1,16 +1,12 @@
-import ctypes.wintypes
+import ctypes
 import sys
 
-assert sys.platform == "win32"
-
-win32con_WM_COPYDATA: int
-
-def can_talk_to_agent(): ...
-
-class COPYDATASTRUCT(ctypes.Structure): ...
-
-class PageantConnection:
-    def __init__(self) -> None: ...
-    def send(self, data: bytes) -> None: ...
-    def recv(self, n: int) -> bytes: ...
-    def close(self) -> None: ...
+if sys.platform == "win32":
+    win32con_WM_COPYDATA: int
+    def can_talk_to_agent(): ...
+    class COPYDATASTRUCT(ctypes.Structure): ...
+    class PageantConnection:
+        def __init__(self) -> None: ...
+        def send(self, data: bytes) -> None: ...
+        def recv(self, n: int) -> bytes: ...
+        def close(self) -> None: ...

stubs/protobuf/google/protobuf/any_pb2.pyi

@@ -40,8 +40,8 @@ class Any(google___protobuf___message___Message, google___protobuf___internal___
 
     def __init__(self,
         *,
-        type_url : typing___Optional[typing___Text] = None,
-        value : typing___Optional[builtin___bytes] = None,
+        type_url : typing___Optional[typing___Text] = ...,
+        value : typing___Optional[builtin___bytes] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"type_url",b"type_url",u"value",b"value"]) -> None: ...
 type___Any = Any

stubs/protobuf/google/protobuf/api_pb2.pyi

@@ -63,13 +63,13 @@ class Api(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Text] = None,
-        methods : typing___Optional[typing___Iterable[type___Method]] = None,
-        options : typing___Optional[typing___Iterable[google___protobuf___type_pb2___Option]] = None,
-        version : typing___Optional[typing___Text] = None,
-        source_context : typing___Optional[google___protobuf___source_context_pb2___SourceContext] = None,
-        mixins : typing___Optional[typing___Iterable[type___Mixin]] = None,
-        syntax : typing___Optional[google___protobuf___type_pb2___SyntaxValue] = None,
+        name : typing___Optional[typing___Text] = ...,
+        methods : typing___Optional[typing___Iterable[type___Method]] = ...,
+        options : typing___Optional[typing___Iterable[google___protobuf___type_pb2___Option]] = ...,
+        version : typing___Optional[typing___Text] = ...,
+        source_context : typing___Optional[google___protobuf___source_context_pb2___SourceContext] = ...,
+        mixins : typing___Optional[typing___Iterable[type___Mixin]] = ...,
+        syntax : typing___Optional[google___protobuf___type_pb2___SyntaxValue] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"source_context",b"source_context"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"methods",b"methods",u"mixins",b"mixins",u"name",b"name",u"options",b"options",u"source_context",b"source_context",u"syntax",b"syntax",u"version",b"version"]) -> None: ...
@@ -89,13 +89,13 @@ class Method(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Text] = None,
-        request_type_url : typing___Optional[typing___Text] = None,
-        request_streaming : typing___Optional[builtin___bool] = None,
-        response_type_url : typing___Optional[typing___Text] = None,
-        response_streaming : typing___Optional[builtin___bool] = None,
-        options : typing___Optional[typing___Iterable[google___protobuf___type_pb2___Option]] = None,
-        syntax : typing___Optional[google___protobuf___type_pb2___SyntaxValue] = None,
+        name : typing___Optional[typing___Text] = ...,
+        request_type_url : typing___Optional[typing___Text] = ...,
+        request_streaming : typing___Optional[builtin___bool] = ...,
+        response_type_url : typing___Optional[typing___Text] = ...,
+        response_streaming : typing___Optional[builtin___bool] = ...,
+        options : typing___Optional[typing___Iterable[google___protobuf___type_pb2___Option]] = ...,
+        syntax : typing___Optional[google___protobuf___type_pb2___SyntaxValue] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"name",b"name",u"options",b"options",u"request_streaming",b"request_streaming",u"request_type_url",b"request_type_url",u"response_streaming",b"response_streaming",u"response_type_url",b"response_type_url",u"syntax",b"syntax"]) -> None: ...
 type___Method = Method
@@ -107,8 +107,8 @@ class Mixin(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Text] = None,
-        root : typing___Optional[typing___Text] = None,
+        name : typing___Optional[typing___Text] = ...,
+        root : typing___Optional[typing___Text] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"name",b"name",u"root",b"root"]) -> None: ...
 type___Mixin = Mixin

stubs/protobuf/google/protobuf/compiler/plugin_pb2.pyi

@@ -56,10 +56,10 @@ class Version(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        major : typing___Optional[builtin___int] = None,
-        minor : typing___Optional[builtin___int] = None,
-        patch : typing___Optional[builtin___int] = None,
-        suffix : typing___Optional[typing___Text] = None,
+        major : typing___Optional[builtin___int] = ...,
+        minor : typing___Optional[builtin___int] = ...,
+        patch : typing___Optional[builtin___int] = ...,
+        suffix : typing___Optional[typing___Text] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"major",b"major",u"minor",b"minor",u"patch",b"patch",u"suffix",b"suffix"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"major",b"major",u"minor",b"minor",u"patch",b"patch",u"suffix",b"suffix"]) -> None: ...
@@ -78,10 +78,10 @@ class CodeGeneratorRequest(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        file_to_generate : typing___Optional[typing___Iterable[typing___Text]] = None,
-        parameter : typing___Optional[typing___Text] = None,
-        proto_file : typing___Optional[typing___Iterable[google___protobuf___descriptor_pb2___FileDescriptorProto]] = None,
-        compiler_version : typing___Optional[type___Version] = None,
+        file_to_generate : typing___Optional[typing___Iterable[typing___Text]] = ...,
+        parameter : typing___Optional[typing___Text] = ...,
+        proto_file : typing___Optional[typing___Iterable[google___protobuf___descriptor_pb2___FileDescriptorProto]] = ...,
+        compiler_version : typing___Optional[type___Version] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"compiler_version",b"compiler_version",u"parameter",b"parameter"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"compiler_version",b"compiler_version",u"file_to_generate",b"file_to_generate",u"parameter",b"parameter",u"proto_file",b"proto_file"]) -> None: ...
@@ -110,10 +110,10 @@ class CodeGeneratorResponse(google___protobuf___message___Message):
 
         def __init__(self,
             *,
-            name : typing___Optional[typing___Text] = None,
-            insertion_point : typing___Optional[typing___Text] = None,
-            content : typing___Optional[typing___Text] = None,
-            generated_code_info : typing___Optional[google___protobuf___descriptor_pb2___GeneratedCodeInfo] = None,
+            name : typing___Optional[typing___Text] = ...,
+            insertion_point : typing___Optional[typing___Text] = ...,
+            content : typing___Optional[typing___Text] = ...,
+            generated_code_info : typing___Optional[google___protobuf___descriptor_pb2___GeneratedCodeInfo] = ...,
             ) -> None: ...
         def HasField(self, field_name: typing_extensions___Literal[u"content",b"content",u"generated_code_info",b"generated_code_info",u"insertion_point",b"insertion_point",u"name",b"name"]) -> builtin___bool: ...
         def ClearField(self, field_name: typing_extensions___Literal[u"content",b"content",u"generated_code_info",b"generated_code_info",u"insertion_point",b"insertion_point",u"name",b"name"]) -> None: ...
@@ -127,9 +127,9 @@ class CodeGeneratorResponse(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        error : typing___Optional[typing___Text] = None,
-        supported_features : typing___Optional[builtin___int] = None,
-        file : typing___Optional[typing___Iterable[type___CodeGeneratorResponse.File]] = None,
+        error : typing___Optional[typing___Text] = ...,
+        supported_features : typing___Optional[builtin___int] = ...,
+        file : typing___Optional[typing___Iterable[type___CodeGeneratorResponse.File]] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"error",b"error",u"supported_features",b"supported_features"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"error",b"error",u"file",b"file",u"supported_features",b"supported_features"]) -> None: ...

stubs/protobuf/google/protobuf/descriptor_pb2.pyi

@@ -50,7 +50,7 @@ class FileDescriptorSet(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        file : typing___Optional[typing___Iterable[type___FileDescriptorProto]] = None,
+        file : typing___Optional[typing___Iterable[type___FileDescriptorProto]] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"file",b"file"]) -> None: ...
 type___FileDescriptorSet = FileDescriptorSet
@@ -84,18 +84,18 @@ class FileDescriptorProto(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Text] = None,
-        package : typing___Optional[typing___Text] = None,
-        dependency : typing___Optional[typing___Iterable[typing___Text]] = None,
-        public_dependency : typing___Optional[typing___Iterable[builtin___int]] = None,
-        weak_dependency : typing___Optional[typing___Iterable[builtin___int]] = None,
-        message_type : typing___Optional[typing___Iterable[type___DescriptorProto]] = None,
-        enum_type : typing___Optional[typing___Iterable[type___EnumDescriptorProto]] = None,
-        service : typing___Optional[typing___Iterable[type___ServiceDescriptorProto]] = None,
-        extension : typing___Optional[typing___Iterable[type___FieldDescriptorProto]] = None,
-        options : typing___Optional[type___FileOptions] = None,
-        source_code_info : typing___Optional[type___SourceCodeInfo] = None,
-        syntax : typing___Optional[typing___Text] = None,
+        name : typing___Optional[typing___Text] = ...,
+        package : typing___Optional[typing___Text] = ...,
+        dependency : typing___Optional[typing___Iterable[typing___Text]] = ...,
+        public_dependency : typing___Optional[typing___Iterable[builtin___int]] = ...,
+        weak_dependency : typing___Optional[typing___Iterable[builtin___int]] = ...,
+        message_type : typing___Optional[typing___Iterable[type___DescriptorProto]] = ...,
+        enum_type : typing___Optional[typing___Iterable[type___EnumDescriptorProto]] = ...,
+        service : typing___Optional[typing___Iterable[type___ServiceDescriptorProto]] = ...,
+        extension : typing___Optional[typing___Iterable[type___FieldDescriptorProto]] = ...,
+        options : typing___Optional[type___FileOptions] = ...,
+        source_code_info : typing___Optional[type___SourceCodeInfo] = ...,
+        syntax : typing___Optional[typing___Text] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"name",b"name",u"options",b"options",u"package",b"package",u"source_code_info",b"source_code_info",u"syntax",b"syntax"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"dependency",b"dependency",u"enum_type",b"enum_type",u"extension",b"extension",u"message_type",b"message_type",u"name",b"name",u"options",b"options",u"package",b"package",u"public_dependency",b"public_dependency",u"service",b"service",u"source_code_info",b"source_code_info",u"syntax",b"syntax",u"weak_dependency",b"weak_dependency"]) -> None: ...
@@ -113,9 +113,9 @@ class DescriptorProto(google___protobuf___message___Message):
 
         def __init__(self,
             *,
-            start : typing___Optional[builtin___int] = None,
-            end : typing___Optional[builtin___int] = None,
-            options : typing___Optional[type___ExtensionRangeOptions] = None,
+            start : typing___Optional[builtin___int] = ...,
+            end : typing___Optional[builtin___int] = ...,
+            options : typing___Optional[type___ExtensionRangeOptions] = ...,
             ) -> None: ...
         def HasField(self, field_name: typing_extensions___Literal[u"end",b"end",u"options",b"options",u"start",b"start"]) -> builtin___bool: ...
         def ClearField(self, field_name: typing_extensions___Literal[u"end",b"end",u"options",b"options",u"start",b"start"]) -> None: ...
@@ -128,8 +128,8 @@ class DescriptorProto(google___protobuf___message___Message):
 
         def __init__(self,
             *,
-            start : typing___Optional[builtin___int] = None,
-            end : typing___Optional[builtin___int] = None,
+            start : typing___Optional[builtin___int] = ...,
+            end : typing___Optional[builtin___int] = ...,
             ) -> None: ...
         def HasField(self, field_name: typing_extensions___Literal[u"end",b"end",u"start",b"start"]) -> builtin___bool: ...
         def ClearField(self, field_name: typing_extensions___Literal[u"end",b"end",u"start",b"start"]) -> None: ...
@@ -164,16 +164,16 @@ class DescriptorProto(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Text] = None,
-        field : typing___Optional[typing___Iterable[type___FieldDescriptorProto]] = None,
-        extension : typing___Optional[typing___Iterable[type___FieldDescriptorProto]] = None,
-        nested_type : typing___Optional[typing___Iterable[type___DescriptorProto]] = None,
-        enum_type : typing___Optional[typing___Iterable[type___EnumDescriptorProto]] = None,
-        extension_range : typing___Optional[typing___Iterable[type___DescriptorProto.ExtensionRange]] = None,
-        oneof_decl : typing___Optional[typing___Iterable[type___OneofDescriptorProto]] = None,
-        options : typing___Optional[type___MessageOptions] = None,
-        reserved_range : typing___Optional[typing___Iterable[type___DescriptorProto.ReservedRange]] = None,
-        reserved_name : typing___Optional[typing___Iterable[typing___Text]] = None,
+        name : typing___Optional[typing___Text] = ...,
+        field : typing___Optional[typing___Iterable[type___FieldDescriptorProto]] = ...,
+        extension : typing___Optional[typing___Iterable[type___FieldDescriptorProto]] = ...,
+        nested_type : typing___Optional[typing___Iterable[type___DescriptorProto]] = ...,
+        enum_type : typing___Optional[typing___Iterable[type___EnumDescriptorProto]] = ...,
+        extension_range : typing___Optional[typing___Iterable[type___DescriptorProto.ExtensionRange]] = ...,
+        oneof_decl : typing___Optional[typing___Iterable[type___OneofDescriptorProto]] = ...,
+        options : typing___Optional[type___MessageOptions] = ...,
+        reserved_range : typing___Optional[typing___Iterable[type___DescriptorProto.ReservedRange]] = ...,
+        reserved_name : typing___Optional[typing___Iterable[typing___Text]] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"name",b"name",u"options",b"options"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"enum_type",b"enum_type",u"extension",b"extension",u"extension_range",b"extension_range",u"field",b"field",u"name",b"name",u"nested_type",b"nested_type",u"oneof_decl",b"oneof_decl",u"options",b"options",u"reserved_name",b"reserved_name",u"reserved_range",b"reserved_range"]) -> None: ...
@@ -187,7 +187,7 @@ class ExtensionRangeOptions(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = None,
+        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"uninterpreted_option",b"uninterpreted_option"]) -> None: ...
 type___ExtensionRangeOptions = ExtensionRangeOptions
@@ -264,17 +264,17 @@ class FieldDescriptorProto(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Text] = None,
-        number : typing___Optional[builtin___int] = None,
-        label : typing___Optional[type___FieldDescriptorProto.LabelValue] = None,
-        type : typing___Optional[type___FieldDescriptorProto.TypeValue] = None,
-        type_name : typing___Optional[typing___Text] = None,
-        extendee : typing___Optional[typing___Text] = None,
-        default_value : typing___Optional[typing___Text] = None,
-        oneof_index : typing___Optional[builtin___int] = None,
-        json_name : typing___Optional[typing___Text] = None,
-        options : typing___Optional[type___FieldOptions] = None,
-        proto3_optional : typing___Optional[builtin___bool] = None,
+        name : typing___Optional[typing___Text] = ...,
+        number : typing___Optional[builtin___int] = ...,
+        label : typing___Optional[type___FieldDescriptorProto.LabelValue] = ...,
+        type : typing___Optional[type___FieldDescriptorProto.TypeValue] = ...,
+        type_name : typing___Optional[typing___Text] = ...,
+        extendee : typing___Optional[typing___Text] = ...,
+        default_value : typing___Optional[typing___Text] = ...,
+        oneof_index : typing___Optional[builtin___int] = ...,
+        json_name : typing___Optional[typing___Text] = ...,
+        options : typing___Optional[type___FieldOptions] = ...,
+        proto3_optional : typing___Optional[builtin___bool] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"default_value",b"default_value",u"extendee",b"extendee",u"json_name",b"json_name",u"label",b"label",u"name",b"name",u"number",b"number",u"oneof_index",b"oneof_index",u"options",b"options",u"proto3_optional",b"proto3_optional",u"type",b"type",u"type_name",b"type_name"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"default_value",b"default_value",u"extendee",b"extendee",u"json_name",b"json_name",u"label",b"label",u"name",b"name",u"number",b"number",u"oneof_index",b"oneof_index",u"options",b"options",u"proto3_optional",b"proto3_optional",u"type",b"type",u"type_name",b"type_name"]) -> None: ...
@@ -289,8 +289,8 @@ class OneofDescriptorProto(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Text] = None,
-        options : typing___Optional[type___OneofOptions] = None,
+        name : typing___Optional[typing___Text] = ...,
+        options : typing___Optional[type___OneofOptions] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"name",b"name",u"options",b"options"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"name",b"name",u"options",b"options"]) -> None: ...
@@ -305,8 +305,8 @@ class EnumDescriptorProto(google___protobuf___message___Message):
 
         def __init__(self,
             *,
-            start : typing___Optional[builtin___int] = None,
-            end : typing___Optional[builtin___int] = None,
+            start : typing___Optional[builtin___int] = ...,
+            end : typing___Optional[builtin___int] = ...,
             ) -> None: ...
         def HasField(self, field_name: typing_extensions___Literal[u"end",b"end",u"start",b"start"]) -> builtin___bool: ...
         def ClearField(self, field_name: typing_extensions___Literal[u"end",b"end",u"start",b"start"]) -> None: ...
@@ -326,11 +326,11 @@ class EnumDescriptorProto(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Text] = None,
-        value : typing___Optional[typing___Iterable[type___EnumValueDescriptorProto]] = None,
-        options : typing___Optional[type___EnumOptions] = None,
-        reserved_range : typing___Optional[typing___Iterable[type___EnumDescriptorProto.EnumReservedRange]] = None,
-        reserved_name : typing___Optional[typing___Iterable[typing___Text]] = None,
+        name : typing___Optional[typing___Text] = ...,
+        value : typing___Optional[typing___Iterable[type___EnumValueDescriptorProto]] = ...,
+        options : typing___Optional[type___EnumOptions] = ...,
+        reserved_range : typing___Optional[typing___Iterable[type___EnumDescriptorProto.EnumReservedRange]] = ...,
+        reserved_name : typing___Optional[typing___Iterable[typing___Text]] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"name",b"name",u"options",b"options"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"name",b"name",u"options",b"options",u"reserved_name",b"reserved_name",u"reserved_range",b"reserved_range",u"value",b"value"]) -> None: ...
@@ -346,9 +346,9 @@ class EnumValueDescriptorProto(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Text] = None,
-        number : typing___Optional[builtin___int] = None,
-        options : typing___Optional[type___EnumValueOptions] = None,
+        name : typing___Optional[typing___Text] = ...,
+        number : typing___Optional[builtin___int] = ...,
+        options : typing___Optional[type___EnumValueOptions] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"name",b"name",u"number",b"number",u"options",b"options"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"name",b"name",u"number",b"number",u"options",b"options"]) -> None: ...
@@ -366,9 +366,9 @@ class ServiceDescriptorProto(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Text] = None,
-        method : typing___Optional[typing___Iterable[type___MethodDescriptorProto]] = None,
-        options : typing___Optional[type___ServiceOptions] = None,
+        name : typing___Optional[typing___Text] = ...,
+        method : typing___Optional[typing___Iterable[type___MethodDescriptorProto]] = ...,
+        options : typing___Optional[type___ServiceOptions] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"name",b"name",u"options",b"options"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"method",b"method",u"name",b"name",u"options",b"options"]) -> None: ...
@@ -387,12 +387,12 @@ class MethodDescriptorProto(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Text] = None,
-        input_type : typing___Optional[typing___Text] = None,
-        output_type : typing___Optional[typing___Text] = None,
-        options : typing___Optional[type___MethodOptions] = None,
-        client_streaming : typing___Optional[builtin___bool] = None,
-        server_streaming : typing___Optional[builtin___bool] = None,
+        name : typing___Optional[typing___Text] = ...,
+        input_type : typing___Optional[typing___Text] = ...,
+        output_type : typing___Optional[typing___Text] = ...,
+        options : typing___Optional[type___MethodOptions] = ...,
+        client_streaming : typing___Optional[builtin___bool] = ...,
+        server_streaming : typing___Optional[builtin___bool] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"client_streaming",b"client_streaming",u"input_type",b"input_type",u"name",b"name",u"options",b"options",u"output_type",b"output_type",u"server_streaming",b"server_streaming"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"client_streaming",b"client_streaming",u"input_type",b"input_type",u"name",b"name",u"options",b"options",u"output_type",b"output_type",u"server_streaming",b"server_streaming"]) -> None: ...
@@ -438,27 +438,27 @@ class FileOptions(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        java_package : typing___Optional[typing___Text] = None,
-        java_outer_classname : typing___Optional[typing___Text] = None,
-        java_multiple_files : typing___Optional[builtin___bool] = None,
-        java_generate_equals_and_hash : typing___Optional[builtin___bool] = None,
-        java_string_check_utf8 : typing___Optional[builtin___bool] = None,
-        optimize_for : typing___Optional[type___FileOptions.OptimizeModeValue] = None,
-        go_package : typing___Optional[typing___Text] = None,
-        cc_generic_services : typing___Optional[builtin___bool] = None,
-        java_generic_services : typing___Optional[builtin___bool] = None,
-        py_generic_services : typing___Optional[builtin___bool] = None,
-        php_generic_services : typing___Optional[builtin___bool] = None,
-        deprecated : typing___Optional[builtin___bool] = None,
-        cc_enable_arenas : typing___Optional[builtin___bool] = None,
-        objc_class_prefix : typing___Optional[typing___Text] = None,
-        csharp_namespace : typing___Optional[typing___Text] = None,
-        swift_prefix : typing___Optional[typing___Text] = None,
-        php_class_prefix : typing___Optional[typing___Text] = None,
-        php_namespace : typing___Optional[typing___Text] = None,
-        php_metadata_namespace : typing___Optional[typing___Text] = None,
-        ruby_package : typing___Optional[typing___Text] = None,
-        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = None,
+        java_package : typing___Optional[typing___Text] = ...,
+        java_outer_classname : typing___Optional[typing___Text] = ...,
+        java_multiple_files : typing___Optional[builtin___bool] = ...,
+        java_generate_equals_and_hash : typing___Optional[builtin___bool] = ...,
+        java_string_check_utf8 : typing___Optional[builtin___bool] = ...,
+        optimize_for : typing___Optional[type___FileOptions.OptimizeModeValue] = ...,
+        go_package : typing___Optional[typing___Text] = ...,
+        cc_generic_services : typing___Optional[builtin___bool] = ...,
+        java_generic_services : typing___Optional[builtin___bool] = ...,
+        py_generic_services : typing___Optional[builtin___bool] = ...,
+        php_generic_services : typing___Optional[builtin___bool] = ...,
+        deprecated : typing___Optional[builtin___bool] = ...,
+        cc_enable_arenas : typing___Optional[builtin___bool] = ...,
+        objc_class_prefix : typing___Optional[typing___Text] = ...,
+        csharp_namespace : typing___Optional[typing___Text] = ...,
+        swift_prefix : typing___Optional[typing___Text] = ...,
+        php_class_prefix : typing___Optional[typing___Text] = ...,
+        php_namespace : typing___Optional[typing___Text] = ...,
+        php_metadata_namespace : typing___Optional[typing___Text] = ...,
+        ruby_package : typing___Optional[typing___Text] = ...,
+        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"cc_enable_arenas",b"cc_enable_arenas",u"cc_generic_services",b"cc_generic_services",u"csharp_namespace",b"csharp_namespace",u"deprecated",b"deprecated",u"go_package",b"go_package",u"java_generate_equals_and_hash",b"java_generate_equals_and_hash",u"java_generic_services",b"java_generic_services",u"java_multiple_files",b"java_multiple_files",u"java_outer_classname",b"java_outer_classname",u"java_package",b"java_package",u"java_string_check_utf8",b"java_string_check_utf8",u"objc_class_prefix",b"objc_class_prefix",u"optimize_for",b"optimize_for",u"php_class_prefix",b"php_class_prefix",u"php_generic_services",b"php_generic_services",u"php_metadata_namespace",b"php_metadata_namespace",u"php_namespace",b"php_namespace",u"py_generic_services",b"py_generic_services",u"ruby_package",b"ruby_package",u"swift_prefix",b"swift_prefix"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"cc_enable_arenas",b"cc_enable_arenas",u"cc_generic_services",b"cc_generic_services",u"csharp_namespace",b"csharp_namespace",u"deprecated",b"deprecated",u"go_package",b"go_package",u"java_generate_equals_and_hash",b"java_generate_equals_and_hash",u"java_generic_services",b"java_generic_services",u"java_multiple_files",b"java_multiple_files",u"java_outer_classname",b"java_outer_classname",u"java_package",b"java_package",u"java_string_check_utf8",b"java_string_check_utf8",u"objc_class_prefix",b"objc_class_prefix",u"optimize_for",b"optimize_for",u"php_class_prefix",b"php_class_prefix",u"php_generic_services",b"php_generic_services",u"php_metadata_namespace",b"php_metadata_namespace",u"php_namespace",b"php_namespace",u"py_generic_services",b"py_generic_services",u"ruby_package",b"ruby_package",u"swift_prefix",b"swift_prefix",u"uninterpreted_option",b"uninterpreted_option"]) -> None: ...
@@ -476,11 +476,11 @@ class MessageOptions(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        message_set_wire_format : typing___Optional[builtin___bool] = None,
-        no_standard_descriptor_accessor : typing___Optional[builtin___bool] = None,
-        deprecated : typing___Optional[builtin___bool] = None,
-        map_entry : typing___Optional[builtin___bool] = None,
-        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = None,
+        message_set_wire_format : typing___Optional[builtin___bool] = ...,
+        no_standard_descriptor_accessor : typing___Optional[builtin___bool] = ...,
+        deprecated : typing___Optional[builtin___bool] = ...,
+        map_entry : typing___Optional[builtin___bool] = ...,
+        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"deprecated",b"deprecated",u"map_entry",b"map_entry",u"message_set_wire_format",b"message_set_wire_format",u"no_standard_descriptor_accessor",b"no_standard_descriptor_accessor"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"deprecated",b"deprecated",u"map_entry",b"map_entry",u"message_set_wire_format",b"message_set_wire_format",u"no_standard_descriptor_accessor",b"no_standard_descriptor_accessor",u"uninterpreted_option",b"uninterpreted_option"]) -> None: ...
@@ -524,13 +524,13 @@ class FieldOptions(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        ctype : typing___Optional[type___FieldOptions.CTypeValue] = None,
-        packed : typing___Optional[builtin___bool] = None,
-        jstype : typing___Optional[type___FieldOptions.JSTypeValue] = None,
-        lazy : typing___Optional[builtin___bool] = None,
-        deprecated : typing___Optional[builtin___bool] = None,
-        weak : typing___Optional[builtin___bool] = None,
-        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = None,
+        ctype : typing___Optional[type___FieldOptions.CTypeValue] = ...,
+        packed : typing___Optional[builtin___bool] = ...,
+        jstype : typing___Optional[type___FieldOptions.JSTypeValue] = ...,
+        lazy : typing___Optional[builtin___bool] = ...,
+        deprecated : typing___Optional[builtin___bool] = ...,
+        weak : typing___Optional[builtin___bool] = ...,
+        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"ctype",b"ctype",u"deprecated",b"deprecated",u"jstype",b"jstype",u"lazy",b"lazy",u"packed",b"packed",u"weak",b"weak"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"ctype",b"ctype",u"deprecated",b"deprecated",u"jstype",b"jstype",u"lazy",b"lazy",u"packed",b"packed",u"uninterpreted_option",b"uninterpreted_option",u"weak",b"weak"]) -> None: ...
@@ -544,7 +544,7 @@ class OneofOptions(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = None,
+        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"uninterpreted_option",b"uninterpreted_option"]) -> None: ...
 type___OneofOptions = OneofOptions
@@ -559,9 +559,9 @@ class EnumOptions(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        allow_alias : typing___Optional[builtin___bool] = None,
-        deprecated : typing___Optional[builtin___bool] = None,
-        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = None,
+        allow_alias : typing___Optional[builtin___bool] = ...,
+        deprecated : typing___Optional[builtin___bool] = ...,
+        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"allow_alias",b"allow_alias",u"deprecated",b"deprecated"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"allow_alias",b"allow_alias",u"deprecated",b"deprecated",u"uninterpreted_option",b"uninterpreted_option"]) -> None: ...
@@ -576,8 +576,8 @@ class EnumValueOptions(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        deprecated : typing___Optional[builtin___bool] = None,
-        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = None,
+        deprecated : typing___Optional[builtin___bool] = ...,
+        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"deprecated",b"deprecated"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"deprecated",b"deprecated",u"uninterpreted_option",b"uninterpreted_option"]) -> None: ...
@@ -592,8 +592,8 @@ class ServiceOptions(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        deprecated : typing___Optional[builtin___bool] = None,
-        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = None,
+        deprecated : typing___Optional[builtin___bool] = ...,
+        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"deprecated",b"deprecated"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"deprecated",b"deprecated",u"uninterpreted_option",b"uninterpreted_option"]) -> None: ...
@@ -621,9 +621,9 @@ class MethodOptions(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        deprecated : typing___Optional[builtin___bool] = None,
-        idempotency_level : typing___Optional[type___MethodOptions.IdempotencyLevelValue] = None,
-        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = None,
+        deprecated : typing___Optional[builtin___bool] = ...,
+        idempotency_level : typing___Optional[type___MethodOptions.IdempotencyLevelValue] = ...,
+        uninterpreted_option : typing___Optional[typing___Iterable[type___UninterpretedOption]] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"deprecated",b"deprecated",u"idempotency_level",b"idempotency_level"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"deprecated",b"deprecated",u"idempotency_level",b"idempotency_level",u"uninterpreted_option",b"uninterpreted_option"]) -> None: ...
@@ -638,8 +638,8 @@ class UninterpretedOption(google___protobuf___message___Message):
 
         def __init__(self,
             *,
-            name_part : typing___Optional[typing___Text] = None,
-            is_extension : typing___Optional[builtin___bool] = None,
+            name_part : typing___Optional[typing___Text] = ...,
+            is_extension : typing___Optional[builtin___bool] = ...,
             ) -> None: ...
         def HasField(self, field_name: typing_extensions___Literal[u"is_extension",b"is_extension",u"name_part",b"name_part"]) -> builtin___bool: ...
         def ClearField(self, field_name: typing_extensions___Literal[u"is_extension",b"is_extension",u"name_part",b"name_part"]) -> None: ...
@@ -657,13 +657,13 @@ class UninterpretedOption(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Iterable[type___UninterpretedOption.NamePart]] = None,
-        identifier_value : typing___Optional[typing___Text] = None,
-        positive_int_value : typing___Optional[builtin___int] = None,
-        negative_int_value : typing___Optional[builtin___int] = None,
-        double_value : typing___Optional[builtin___float] = None,
-        string_value : typing___Optional[builtin___bytes] = None,
-        aggregate_value : typing___Optional[typing___Text] = None,
+        name : typing___Optional[typing___Iterable[type___UninterpretedOption.NamePart]] = ...,
+        identifier_value : typing___Optional[typing___Text] = ...,
+        positive_int_value : typing___Optional[builtin___int] = ...,
+        negative_int_value : typing___Optional[builtin___int] = ...,
+        double_value : typing___Optional[builtin___float] = ...,
+        string_value : typing___Optional[builtin___bytes] = ...,
+        aggregate_value : typing___Optional[typing___Text] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"aggregate_value",b"aggregate_value",u"double_value",b"double_value",u"identifier_value",b"identifier_value",u"negative_int_value",b"negative_int_value",u"positive_int_value",b"positive_int_value",u"string_value",b"string_value"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"aggregate_value",b"aggregate_value",u"double_value",b"double_value",u"identifier_value",b"identifier_value",u"name",b"name",u"negative_int_value",b"negative_int_value",u"positive_int_value",b"positive_int_value",u"string_value",b"string_value"]) -> None: ...
@@ -681,11 +681,11 @@ class SourceCodeInfo(google___protobuf___message___Message):
 
         def __init__(self,
             *,
-            path : typing___Optional[typing___Iterable[builtin___int]] = None,
-            span : typing___Optional[typing___Iterable[builtin___int]] = None,
-            leading_comments : typing___Optional[typing___Text] = None,
-            trailing_comments : typing___Optional[typing___Text] = None,
-            leading_detached_comments : typing___Optional[typing___Iterable[typing___Text]] = None,
+            path : typing___Optional[typing___Iterable[builtin___int]] = ...,
+            span : typing___Optional[typing___Iterable[builtin___int]] = ...,
+            leading_comments : typing___Optional[typing___Text] = ...,
+            trailing_comments : typing___Optional[typing___Text] = ...,
+            leading_detached_comments : typing___Optional[typing___Iterable[typing___Text]] = ...,
             ) -> None: ...
         def HasField(self, field_name: typing_extensions___Literal[u"leading_comments",b"leading_comments",u"trailing_comments",b"trailing_comments"]) -> builtin___bool: ...
         def ClearField(self, field_name: typing_extensions___Literal[u"leading_comments",b"leading_comments",u"leading_detached_comments",b"leading_detached_comments",u"path",b"path",u"span",b"span",u"trailing_comments",b"trailing_comments"]) -> None: ...
@@ -697,7 +697,7 @@ class SourceCodeInfo(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        location : typing___Optional[typing___Iterable[type___SourceCodeInfo.Location]] = None,
+        location : typing___Optional[typing___Iterable[type___SourceCodeInfo.Location]] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"location",b"location"]) -> None: ...
 type___SourceCodeInfo = SourceCodeInfo
@@ -713,10 +713,10 @@ class GeneratedCodeInfo(google___protobuf___message___Message):
 
         def __init__(self,
             *,
-            path : typing___Optional[typing___Iterable[builtin___int]] = None,
-            source_file : typing___Optional[typing___Text] = None,
-            begin : typing___Optional[builtin___int] = None,
-            end : typing___Optional[builtin___int] = None,
+            path : typing___Optional[typing___Iterable[builtin___int]] = ...,
+            source_file : typing___Optional[typing___Text] = ...,
+            begin : typing___Optional[builtin___int] = ...,
+            end : typing___Optional[builtin___int] = ...,
             ) -> None: ...
         def HasField(self, field_name: typing_extensions___Literal[u"begin",b"begin",u"end",b"end",u"source_file",b"source_file"]) -> builtin___bool: ...
         def ClearField(self, field_name: typing_extensions___Literal[u"begin",b"begin",u"end",b"end",u"path",b"path",u"source_file",b"source_file"]) -> None: ...
@@ -728,7 +728,7 @@ class GeneratedCodeInfo(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        annotation : typing___Optional[typing___Iterable[type___GeneratedCodeInfo.Annotation]] = None,
+        annotation : typing___Optional[typing___Iterable[type___GeneratedCodeInfo.Annotation]] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"annotation",b"annotation"]) -> None: ...
 type___GeneratedCodeInfo = GeneratedCodeInfo

stubs/protobuf/google/protobuf/duration_pb2.pyi

@@ -39,8 +39,8 @@ class Duration(google___protobuf___message___Message, google___protobuf___intern
 
     def __init__(self,
         *,
-        seconds : typing___Optional[builtin___int] = None,
-        nanos : typing___Optional[builtin___int] = None,
+        seconds : typing___Optional[builtin___int] = ...,
+        nanos : typing___Optional[builtin___int] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"nanos",b"nanos",u"seconds",b"seconds"]) -> None: ...
 type___Duration = Duration

stubs/protobuf/google/protobuf/field_mask_pb2.pyi

@@ -44,7 +44,7 @@ class FieldMask(google___protobuf___message___Message, google___protobuf___inter
 
     def __init__(self,
         *,
-        paths : typing___Optional[typing___Iterable[typing___Text]] = None,
+        paths : typing___Optional[typing___Iterable[typing___Text]] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"paths",b"paths"]) -> None: ...
 type___FieldMask = FieldMask

stubs/protobuf/google/protobuf/internal/well_known_types.pyi

@@ -1,5 +1,5 @@
 from datetime import datetime, timedelta
-from typing import Any as tAny, Dict, Optional, Text, Type
+from typing import Any as tAny, Dict, Optional, Type
 
 class Error(Exception): ...
 class ParseError(Error): ...
@@ -91,4 +91,4 @@ class ListValue:
     def add_struct(self): ...
     def add_list(self): ...
 
-WKTBASES: Dict[Text, Type]
+WKTBASES: Dict[str, Type[tAny]]

stubs/protobuf/google/protobuf/source_context_pb2.pyi

@@ -35,7 +35,7 @@ class SourceContext(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        file_name : typing___Optional[typing___Text] = None,
+        file_name : typing___Optional[typing___Text] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"file_name",b"file_name"]) -> None: ...
 type___SourceContext = SourceContext

stubs/protobuf/google/protobuf/struct_pb2.pyi

@@ -72,8 +72,8 @@ class Struct(google___protobuf___message___Message, google___protobuf___internal
 
         def __init__(self,
             *,
-            key : typing___Optional[typing___Text] = None,
-            value : typing___Optional[type___Value] = None,
+            key : typing___Optional[typing___Text] = ...,
+            value : typing___Optional[type___Value] = ...,
             ) -> None: ...
         def HasField(self, field_name: typing_extensions___Literal[u"value",b"value"]) -> builtin___bool: ...
         def ClearField(self, field_name: typing_extensions___Literal[u"key",b"key",u"value",b"value"]) -> None: ...
@@ -85,7 +85,7 @@ class Struct(google___protobuf___message___Message, google___protobuf___internal
 
     def __init__(self,
         *,
-        fields : typing___Optional[typing___Mapping[typing___Text, type___Value]] = None,
+        fields : typing___Optional[typing___Mapping[typing___Text, type___Value]] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"fields",b"fields"]) -> None: ...
 type___Struct = Struct
@@ -105,12 +105,12 @@ class Value(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        null_value : typing___Optional[type___NullValueValue] = None,
-        number_value : typing___Optional[builtin___float] = None,
-        string_value : typing___Optional[typing___Text] = None,
-        bool_value : typing___Optional[builtin___bool] = None,
-        struct_value : typing___Optional[type___Struct] = None,
-        list_value : typing___Optional[type___ListValue] = None,
+        null_value : typing___Optional[type___NullValueValue] = ...,
+        number_value : typing___Optional[builtin___float] = ...,
+        string_value : typing___Optional[typing___Text] = ...,
+        bool_value : typing___Optional[builtin___bool] = ...,
+        struct_value : typing___Optional[type___Struct] = ...,
+        list_value : typing___Optional[type___ListValue] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"bool_value",b"bool_value",u"kind",b"kind",u"list_value",b"list_value",u"null_value",b"null_value",u"number_value",b"number_value",u"string_value",b"string_value",u"struct_value",b"struct_value"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"bool_value",b"bool_value",u"kind",b"kind",u"list_value",b"list_value",u"null_value",b"null_value",u"number_value",b"number_value",u"string_value",b"string_value",u"struct_value",b"struct_value"]) -> None: ...
@@ -125,7 +125,7 @@ class ListValue(google___protobuf___message___Message, google___protobuf___inter
 
     def __init__(self,
         *,
-        values : typing___Optional[typing___Iterable[type___Value]] = None,
+        values : typing___Optional[typing___Iterable[type___Value]] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"values",b"values"]) -> None: ...
 type___ListValue = ListValue

stubs/protobuf/google/protobuf/text_format.pyi

@@ -184,6 +184,8 @@ class _Parser:
     def ParseLines(self, lines: Iterable[Union[Text, bytes]], message: _M) -> _M: ...
     def MergeLines(self, lines: Iterable[Union[Text, bytes]], message: _M) -> _M: ...
 
+_ParseError = ParseError
+
 class Tokenizer:
     token: str = ...
     def __init__(self, lines: Iterable[str], skip_comments: bool = ...) -> None: ...
@@ -206,8 +208,8 @@ class Tokenizer:
     def ConsumeString(self) -> Text: ...
     def ConsumeByteString(self) -> bytes: ...
     def ConsumeEnum(self, field: FieldDescriptor) -> int: ...
-    def ParseErrorPreviousToken(self, message: Message) -> ParseError: ...
-    def ParseError(self, message: Message) -> ParseError: ...
+    def ParseErrorPreviousToken(self, message: Message) -> _ParseError: ...
+    def ParseError(self, message: Message) -> _ParseError: ...
     def NextToken(self) -> None: ...
 
 def ParseInteger(text: str, is_signed: bool = ..., is_long: bool = ...) -> int: ...

stubs/protobuf/google/protobuf/timestamp_pb2.pyi

@@ -39,8 +39,8 @@ class Timestamp(google___protobuf___message___Message, google___protobuf___inter
 
     def __init__(self,
         *,
-        seconds : typing___Optional[builtin___int] = None,
-        nanos : typing___Optional[builtin___int] = None,
+        seconds : typing___Optional[builtin___int] = ...,
+        nanos : typing___Optional[builtin___int] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"nanos",b"nanos",u"seconds",b"seconds"]) -> None: ...
 type___Timestamp = Timestamp

stubs/protobuf/google/protobuf/type_pb2.pyi

@@ -77,12 +77,12 @@ class Type(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Text] = None,
-        fields : typing___Optional[typing___Iterable[type___Field]] = None,
-        oneofs : typing___Optional[typing___Iterable[typing___Text]] = None,
-        options : typing___Optional[typing___Iterable[type___Option]] = None,
-        source_context : typing___Optional[google___protobuf___source_context_pb2___SourceContext] = None,
-        syntax : typing___Optional[type___SyntaxValue] = None,
+        name : typing___Optional[typing___Text] = ...,
+        fields : typing___Optional[typing___Iterable[type___Field]] = ...,
+        oneofs : typing___Optional[typing___Iterable[typing___Text]] = ...,
+        options : typing___Optional[typing___Iterable[type___Option]] = ...,
+        source_context : typing___Optional[google___protobuf___source_context_pb2___SourceContext] = ...,
+        syntax : typing___Optional[type___SyntaxValue] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"source_context",b"source_context"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"fields",b"fields",u"name",b"name",u"oneofs",b"oneofs",u"options",b"options",u"source_context",b"source_context",u"syntax",b"syntax"]) -> None: ...
@@ -163,16 +163,16 @@ class Field(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        kind : typing___Optional[type___Field.KindValue] = None,
-        cardinality : typing___Optional[type___Field.CardinalityValue] = None,
-        number : typing___Optional[builtin___int] = None,
-        name : typing___Optional[typing___Text] = None,
-        type_url : typing___Optional[typing___Text] = None,
-        oneof_index : typing___Optional[builtin___int] = None,
-        packed : typing___Optional[builtin___bool] = None,
-        options : typing___Optional[typing___Iterable[type___Option]] = None,
-        json_name : typing___Optional[typing___Text] = None,
-        default_value : typing___Optional[typing___Text] = None,
+        kind : typing___Optional[type___Field.KindValue] = ...,
+        cardinality : typing___Optional[type___Field.CardinalityValue] = ...,
+        number : typing___Optional[builtin___int] = ...,
+        name : typing___Optional[typing___Text] = ...,
+        type_url : typing___Optional[typing___Text] = ...,
+        oneof_index : typing___Optional[builtin___int] = ...,
+        packed : typing___Optional[builtin___bool] = ...,
+        options : typing___Optional[typing___Iterable[type___Option]] = ...,
+        json_name : typing___Optional[typing___Text] = ...,
+        default_value : typing___Optional[typing___Text] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"cardinality",b"cardinality",u"default_value",b"default_value",u"json_name",b"json_name",u"kind",b"kind",u"name",b"name",u"number",b"number",u"oneof_index",b"oneof_index",u"options",b"options",u"packed",b"packed",u"type_url",b"type_url"]) -> None: ...
 type___Field = Field
@@ -193,11 +193,11 @@ class Enum(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Text] = None,
-        enumvalue : typing___Optional[typing___Iterable[type___EnumValue]] = None,
-        options : typing___Optional[typing___Iterable[type___Option]] = None,
-        source_context : typing___Optional[google___protobuf___source_context_pb2___SourceContext] = None,
-        syntax : typing___Optional[type___SyntaxValue] = None,
+        name : typing___Optional[typing___Text] = ...,
+        enumvalue : typing___Optional[typing___Iterable[type___EnumValue]] = ...,
+        options : typing___Optional[typing___Iterable[type___Option]] = ...,
+        source_context : typing___Optional[google___protobuf___source_context_pb2___SourceContext] = ...,
+        syntax : typing___Optional[type___SyntaxValue] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"source_context",b"source_context"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"enumvalue",b"enumvalue",u"name",b"name",u"options",b"options",u"source_context",b"source_context",u"syntax",b"syntax"]) -> None: ...
@@ -213,9 +213,9 @@ class EnumValue(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Text] = None,
-        number : typing___Optional[builtin___int] = None,
-        options : typing___Optional[typing___Iterable[type___Option]] = None,
+        name : typing___Optional[typing___Text] = ...,
+        number : typing___Optional[builtin___int] = ...,
+        options : typing___Optional[typing___Iterable[type___Option]] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"name",b"name",u"number",b"number",u"options",b"options"]) -> None: ...
 type___EnumValue = EnumValue
@@ -229,8 +229,8 @@ class Option(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        name : typing___Optional[typing___Text] = None,
-        value : typing___Optional[google___protobuf___any_pb2___Any] = None,
+        name : typing___Optional[typing___Text] = ...,
+        value : typing___Optional[google___protobuf___any_pb2___Any] = ...,
         ) -> None: ...
     def HasField(self, field_name: typing_extensions___Literal[u"value",b"value"]) -> builtin___bool: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"name",b"name",u"value",b"value"]) -> None: ...

stubs/protobuf/google/protobuf/wrappers_pb2.pyi

@@ -35,7 +35,7 @@ class DoubleValue(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        value : typing___Optional[builtin___float] = None,
+        value : typing___Optional[builtin___float] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"value",b"value"]) -> None: ...
 type___DoubleValue = DoubleValue
@@ -46,7 +46,7 @@ class FloatValue(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        value : typing___Optional[builtin___float] = None,
+        value : typing___Optional[builtin___float] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"value",b"value"]) -> None: ...
 type___FloatValue = FloatValue
@@ -57,7 +57,7 @@ class Int64Value(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        value : typing___Optional[builtin___int] = None,
+        value : typing___Optional[builtin___int] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"value",b"value"]) -> None: ...
 type___Int64Value = Int64Value
@@ -68,7 +68,7 @@ class UInt64Value(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        value : typing___Optional[builtin___int] = None,
+        value : typing___Optional[builtin___int] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"value",b"value"]) -> None: ...
 type___UInt64Value = UInt64Value
@@ -79,7 +79,7 @@ class Int32Value(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        value : typing___Optional[builtin___int] = None,
+        value : typing___Optional[builtin___int] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"value",b"value"]) -> None: ...
 type___Int32Value = Int32Value
@@ -90,7 +90,7 @@ class UInt32Value(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        value : typing___Optional[builtin___int] = None,
+        value : typing___Optional[builtin___int] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"value",b"value"]) -> None: ...
 type___UInt32Value = UInt32Value
@@ -101,7 +101,7 @@ class BoolValue(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        value : typing___Optional[builtin___bool] = None,
+        value : typing___Optional[builtin___bool] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"value",b"value"]) -> None: ...
 type___BoolValue = BoolValue
@@ -112,7 +112,7 @@ class StringValue(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        value : typing___Optional[typing___Text] = None,
+        value : typing___Optional[typing___Text] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"value",b"value"]) -> None: ...
 type___StringValue = StringValue
@@ -123,7 +123,7 @@ class BytesValue(google___protobuf___message___Message):
 
     def __init__(self,
         *,
-        value : typing___Optional[builtin___bytes] = None,
+        value : typing___Optional[builtin___bytes] = ...,
         ) -> None: ...
     def ClearField(self, field_name: typing_extensions___Literal[u"value",b"value"]) -> None: ...
 type___BytesValue = BytesValue

stubs/redis/redis/client.pyi

@@ -357,7 +357,7 @@ class Redis(Generic[_StrType]):
         username: Optional[Text] = ...,
     ) -> None: ...
     def set_response_callback(self, command, callback): ...
-    def pipeline(self, transaction: bool = ..., shard_hint: Any = ...) -> Pipeline: ...
+    def pipeline(self, transaction: bool = ..., shard_hint: Any = ...) -> Pipeline[_StrType]: ...
     def transaction(self, func, *watches, **kwargs): ...
     @overload
     def lock(
@@ -779,11 +779,11 @@ class Redis(Generic[_StrType]):
     def pubsub_numpat(self) -> int: ...
     def monitor(self) -> Monitor: ...
     def cluster(self, cluster_arg: str, *args: Any) -> Any: ...
-    def __enter__(self) -> Redis: ...
+    def __enter__(self) -> Redis[_StrType]: ...
     def __exit__(self, exc_type, exc_value, traceback): ...
     def __del__(self) -> None: ...
     def close(self) -> None: ...
-    def client(self) -> Redis: ...
+    def client(self) -> Redis[_StrType]: ...
 
 StrictRedis = Redis
 
@@ -819,7 +819,7 @@ class PubSub:
     def run_in_thread(self, sleep_time=...): ...
     def ping(self, message: Optional[_Value] = ...) -> None: ...
 
-class Pipeline(Redis):
+class Pipeline(Redis[_StrType], Generic[_StrType]):
     UNWATCH_COMMANDS: Any
     connection_pool: Any
     connection: Any
@@ -832,7 +832,7 @@ class Pipeline(Redis):
     scripts: Any
     explicit_transaction: Any
     def __init__(self, connection_pool, response_callbacks, transaction, shard_hint) -> None: ...
-    def __enter__(self) -> Pipeline: ...  # type: ignore [override]
+    def __enter__(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def __exit__(self, exc_type, exc_value, traceback) -> None: ...
     def __del__(self) -> None: ...
     def __len__(self) -> int: ...
@@ -851,15 +851,15 @@ class Pipeline(Redis):
     def unwatch(self) -> bool: ...
     # in the Redis implementation, the following methods are inherited from client.
     def set_response_callback(self, command, callback): ...
-    def pipeline(self, transaction: bool = ..., shard_hint: Any = ...) -> Pipeline: ...  # type: ignore [override]
+    def pipeline(self, transaction: bool = ..., shard_hint: Any = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def lock(self, name, timeout=..., sleep=..., blocking_timeout=..., lock_class=..., thread_local=...): ...
     def pubsub(self, shard_hint: Any = ..., ignore_subscribe_messages: bool = ...) -> PubSub: ...
-    def acl_cat(self, category: Optional[Text] = ...) -> Pipeline: ...  # type: ignore [override]
-    def acl_deluser(self, username: Text) -> Pipeline: ...  # type: ignore [override]
-    def acl_genpass(self) -> Pipeline: ...  # type: ignore [override]
-    def acl_getuser(self, username: Text) -> Pipeline: ...  # type: ignore [override]
-    def acl_list(self) -> Pipeline: ...  # type: ignore [override]
-    def acl_load(self) -> Pipeline: ...  # type: ignore [override]
+    def acl_cat(self, category: Optional[Text] = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def acl_deluser(self, username: Text) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def acl_genpass(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def acl_getuser(self, username: Text) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def acl_list(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def acl_load(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def acl_setuser(  # type: ignore [override]
         self,
         username: Text = ...,
@@ -873,81 +873,81 @@ class Pipeline(Redis):
         reset: bool = ...,
         reset_keys: bool = ...,
         reset_passwords: bool = ...,
-    ) -> Pipeline: ...
-    def acl_users(self) -> Pipeline: ...  # type: ignore [override]
-    def acl_whoami(self) -> Pipeline: ...  # type: ignore [override]
-    def bgrewriteaof(self) -> Pipeline: ...  # type: ignore [override]
-    def bgsave(self) -> Pipeline: ...  # type: ignore [override]
-    def client_id(self) -> Pipeline: ...  # type: ignore [override]
-    def client_kill(self, address: Text) -> Pipeline: ...  # type: ignore [override]
-    def client_list(self) -> Pipeline: ...  # type: ignore [override]
-    def client_getname(self) -> Pipeline: ...  # type: ignore [override]
-    def client_setname(self, name: Text) -> Pipeline: ...  # type: ignore [override]
-    def readwrite(self) -> Pipeline: ...  # type: ignore [override]
-    def readonly(self) -> Pipeline: ...  # type: ignore [override]
-    def config_get(self, pattern=...) -> Pipeline: ...  # type: ignore [override]
-    def config_set(self, name, value) -> Pipeline: ...  # type: ignore [override]
-    def config_resetstat(self) -> Pipeline: ...  # type: ignore [override]
-    def config_rewrite(self) -> Pipeline: ...  # type: ignore [override]
-    def dbsize(self) -> Pipeline: ...  # type: ignore [override]
-    def debug_object(self, key) -> Pipeline: ...  # type: ignore [override]
-    def echo(self, value) -> Pipeline: ...  # type: ignore [override]
-    def flushall(self) -> Pipeline: ...  # type: ignore [override]
-    def flushdb(self) -> Pipeline: ...  # type: ignore [override]
-    def info(self, section: Optional[_Key] = ...) -> Pipeline: ...  # type: ignore [override]
-    def lastsave(self) -> Pipeline: ...  # type: ignore [override]
-    def object(self, infotype, key) -> Pipeline: ...  # type: ignore [override]
-    def ping(self) -> Pipeline: ...  # type: ignore [override]
-    def save(self) -> Pipeline: ...  # type: ignore [override]
+    ) -> Pipeline[_StrType]: ...
+    def acl_users(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def acl_whoami(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def bgrewriteaof(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def bgsave(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def client_id(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def client_kill(self, address: Text) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def client_list(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def client_getname(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def client_setname(self, name: Text) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def readwrite(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def readonly(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def config_get(self, pattern=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def config_set(self, name, value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def config_resetstat(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def config_rewrite(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def dbsize(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def debug_object(self, key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def echo(self, value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def flushall(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def flushdb(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def info(self, section: Optional[_Key] = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def lastsave(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def object(self, infotype, key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def ping(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def save(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def sentinel(self, *args) -> None: ...
-    def sentinel_get_master_addr_by_name(self, service_name) -> Pipeline: ...  # type: ignore [override]
-    def sentinel_master(self, service_name) -> Pipeline: ...  # type: ignore [override]
-    def sentinel_masters(self) -> Pipeline: ...  # type: ignore [override]
-    def sentinel_monitor(self, name, ip, port, quorum) -> Pipeline: ...  # type: ignore [override]
-    def sentinel_remove(self, name) -> Pipeline: ...  # type: ignore [override]
-    def sentinel_sentinels(self, service_name) -> Pipeline: ...  # type: ignore [override]
-    def sentinel_set(self, name, option, value) -> Pipeline: ...  # type: ignore [override]
-    def sentinel_slaves(self, service_name) -> Pipeline: ...  # type: ignore [override]
+    def sentinel_get_master_addr_by_name(self, service_name) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def sentinel_master(self, service_name) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def sentinel_masters(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def sentinel_monitor(self, name, ip, port, quorum) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def sentinel_remove(self, name) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def sentinel_sentinels(self, service_name) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def sentinel_set(self, name, option, value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def sentinel_slaves(self, service_name) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def shutdown(self) -> None: ...
-    def slaveof(self, host=..., port=...) -> Pipeline: ...  # type: ignore [override]
-    def slowlog_get(self, num=...) -> Pipeline: ...  # type: ignore [override]
-    def slowlog_len(self) -> Pipeline: ...  # type: ignore [override]
-    def slowlog_reset(self) -> Pipeline: ...  # type: ignore [override]
-    def time(self) -> Pipeline: ...  # type: ignore [override]
-    def append(self, key, value) -> Pipeline: ...  # type: ignore [override]
-    def bitcount(self, key: _Key, start: Optional[int] = ..., end: Optional[int] = ...) -> Pipeline: ...  # type: ignore [override]
-    def bitop(self, operation, dest, *keys) -> Pipeline: ...  # type: ignore [override]
-    def bitpos(self, key, bit, start=..., end=...) -> Pipeline: ...  # type: ignore [override]
-    def decr(self, name, amount=...) -> Pipeline: ...  # type: ignore [override]
-    def delete(self, *names: _Key) -> Pipeline: ...  # type: ignore [override]
+    def slaveof(self, host=..., port=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def slowlog_get(self, num=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def slowlog_len(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def slowlog_reset(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def time(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def append(self, key, value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def bitcount(self, key: _Key, start: Optional[int] = ..., end: Optional[int] = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def bitop(self, operation, dest, *keys) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def bitpos(self, key, bit, start=..., end=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def decr(self, name, amount=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def delete(self, *names: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def __delitem__(self, _Key) -> None: ...
-    def dump(self, name) -> Pipeline: ...  # type: ignore [override]
-    def exists(self, *names: _Key) -> Pipeline: ...  # type: ignore [override]
-    def __contains__(self, *names: _Key) -> Pipeline: ...  # type: ignore [override]
-    def expire(self, name: _Key, time: Union[int, timedelta]) -> Pipeline: ...  # type: ignore [override]
-    def expireat(self, name, when) -> Pipeline: ...  # type: ignore [override]
-    def get(self, name: _Key) -> Pipeline: ...  # type: ignore [override]
-    def __getitem__(self, name) -> Pipeline: ...  # type: ignore [override]
-    def getbit(self, name: _Key, offset: int) -> Pipeline: ...  # type: ignore [override]
-    def getrange(self, key, start, end) -> Pipeline: ...  # type: ignore [override]
-    def getset(self, name, value) -> Pipeline: ...  # type: ignore [override]
-    def incr(self, name, amount=...) -> Pipeline: ...  # type: ignore [override]
-    def incrby(self, name, amount=...) -> Pipeline: ...  # type: ignore [override]
-    def incrbyfloat(self, name, amount=...) -> Pipeline: ...  # type: ignore [override]
-    def keys(self, pattern: _Key = ...) -> Pipeline: ...  # type: ignore [override]
-    def mget(self, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline: ...  # type: ignore [override]
-    def mset(self, mapping: Mapping[_Key, _Value]) -> Pipeline: ...  # type: ignore [override]
-    def msetnx(self, mapping: Mapping[_Key, _Value]) -> Pipeline: ...  # type: ignore [override]
-    def move(self, name: _Key, db: int) -> Pipeline: ...  # type: ignore [override]
-    def persist(self, name: _Key) -> Pipeline: ...  # type: ignore [override]
-    def pexpire(self, name: _Key, time: Union[int, timedelta]) -> Pipeline: ...  # type: ignore [override]
-    def pexpireat(self, name: _Key, when: Union[int, datetime]) -> Pipeline: ...  # type: ignore [override]
-    def psetex(self, name, time_ms, value) -> Pipeline: ...  # type: ignore [override]
-    def pttl(self, name) -> Pipeline: ...  # type: ignore [override]
-    def randomkey(self) -> Pipeline: ...  # type: ignore [override]
-    def rename(self, src, dst) -> Pipeline: ...  # type: ignore [override]
-    def renamenx(self, src, dst) -> Pipeline: ...  # type: ignore [override]
-    def restore(self, name, ttl, value) -> Pipeline: ...  # type: ignore [override]
+    def dump(self, name) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def exists(self, *names: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def __contains__(self, *names: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def expire(self, name: _Key, time: Union[int, timedelta]) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def expireat(self, name, when) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def get(self, name: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def __getitem__(self, name) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def getbit(self, name: _Key, offset: int) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def getrange(self, key, start, end) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def getset(self, name, value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def incr(self, name, amount=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def incrby(self, name, amount=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def incrbyfloat(self, name, amount=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def keys(self, pattern: _Key = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def mget(self, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def mset(self, mapping: Mapping[_Key, _Value]) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def msetnx(self, mapping: Mapping[_Key, _Value]) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def move(self, name: _Key, db: int) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def persist(self, name: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def pexpire(self, name: _Key, time: Union[int, timedelta]) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def pexpireat(self, name: _Key, when: Union[int, datetime]) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def psetex(self, name, time_ms, value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def pttl(self, name) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def randomkey(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def rename(self, src, dst) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def renamenx(self, src, dst) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def restore(self, name, ttl, value) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def set(  # type: ignore [override]
         self,
         name: _Key,
@@ -957,36 +957,36 @@ class Pipeline(Redis):
         nx: bool = ...,
         xx: bool = ...,
         keepttl: bool = ...,
-    ) -> Pipeline: ...
+    ) -> Pipeline[_StrType]: ...
     def __setitem__(self, name, value) -> None: ...
-    def setbit(self, name: _Key, offset: int, value: int) -> Pipeline: ...  # type: ignore [override]
-    def setex(self, name: _Key, time: Union[int, timedelta], value: _Value) -> Pipeline: ...  # type: ignore [override]
-    def setnx(self, name, value) -> Pipeline: ...  # type: ignore [override]
-    def setrange(self, name, offset, value) -> Pipeline: ...  # type: ignore [override]
-    def strlen(self, name) -> Pipeline: ...  # type: ignore [override]
-    def substr(self, name, start, end=...) -> Pipeline: ...  # type: ignore [override]
-    def ttl(self, name: _Key) -> Pipeline: ...  # type: ignore [override]
-    def type(self, name) -> Pipeline: ...  # type: ignore [override]
-    def unlink(self, *names: _Key) -> Pipeline: ...  # type: ignore [override]
-    def blpop(self, keys: Union[_Value, Iterable[_Value]], timeout: float = ...) -> Pipeline: ...  # type: ignore [override]
-    def brpop(self, keys: Union[_Value, Iterable[_Value]], timeout: float = ...) -> Pipeline: ...  # type: ignore [override]
-    def brpoplpush(self, src, dst, timeout=...) -> Pipeline: ...  # type: ignore [override]
-    def lindex(self, name: _Key, index: int) -> Pipeline: ...  # type: ignore [override]
+    def setbit(self, name: _Key, offset: int, value: int) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def setex(self, name: _Key, time: Union[int, timedelta], value: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def setnx(self, name, value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def setrange(self, name, offset, value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def strlen(self, name) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def substr(self, name, start, end=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def ttl(self, name: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def type(self, name) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def unlink(self, *names: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def blpop(self, keys: Union[_Value, Iterable[_Value]], timeout: float = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def brpop(self, keys: Union[_Value, Iterable[_Value]], timeout: float = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def brpoplpush(self, src, dst, timeout=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def lindex(self, name: _Key, index: int) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def linsert(  # type: ignore [override]
         self, name: _Key, where: Literal["BEFORE", "AFTER", "before", "after"], refvalue: _Value, value: _Value
-    ) -> Pipeline: ...
-    def llen(self, name: _Key) -> Pipeline: ...  # type: ignore [override]
-    def lpop(self, name) -> Pipeline: ...  # type: ignore [override]
-    def lpush(self, name: _Value, *values: _Value) -> Pipeline: ...  # type: ignore [override]
-    def lpushx(self, name, value) -> Pipeline: ...  # type: ignore [override]
-    def lrange(self, name: _Key, start: int, end: int) -> Pipeline: ...  # type: ignore [override]
-    def lrem(self, name: _Key, count: int, value: _Value) -> Pipeline: ...  # type: ignore [override]
-    def lset(self, name: _Key, index: int, value: _Value) -> Pipeline: ...  # type: ignore [override]
-    def ltrim(self, name: _Key, start: int, end: int) -> Pipeline: ...  # type: ignore [override]
-    def rpop(self, name) -> Pipeline: ...  # type: ignore [override]
-    def rpoplpush(self, src, dst) -> Pipeline: ...  # type: ignore [override]
-    def rpush(self, name: _Value, *values: _Value) -> Pipeline: ...  # type: ignore [override]
-    def rpushx(self, name, value) -> Pipeline: ...  # type: ignore [override]
+    ) -> Pipeline[_StrType]: ...
+    def llen(self, name: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def lpop(self, name) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def lpush(self, name: _Value, *values: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def lpushx(self, name, value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def lrange(self, name: _Key, start: int, end: int) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def lrem(self, name: _Key, count: int, value: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def lset(self, name: _Key, index: int, value: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def ltrim(self, name: _Key, start: int, end: int) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def rpop(self, name) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def rpoplpush(self, src, dst) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def rpush(self, name: _Value, *values: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def rpushx(self, name, value) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def sort(  # type: ignore [override]
         self,
         name: _Key,
@@ -998,62 +998,62 @@ class Pipeline(Redis):
         alpha: bool = ...,
         store: Optional[_Key] = ...,
         groups: bool = ...,
-    ) -> Pipeline: ...
-    def scan(self, cursor: int = ..., match: Optional[_Key] = ..., count: Optional[int] = ...) -> Pipeline: ...  # type: ignore [override]
+    ) -> Pipeline[_StrType]: ...
+    def scan(self, cursor: int = ..., match: Optional[_Key] = ..., count: Optional[int] = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def scan_iter(self, match: Optional[Text] = ..., count: Optional[int] = ...) -> Iterator[Any]: ...
-    def sscan(self, name: _Key, cursor: int = ..., match: Text = ..., count: int = ...) -> Pipeline: ...  # type: ignore [override]
+    def sscan(self, name: _Key, cursor: int = ..., match: Text = ..., count: int = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def sscan_iter(self, name, match=..., count=...) -> Iterator[Any]: ...
-    def hscan(self, name: _Key, cursor: int = ..., match: Text = ..., count: int = ...) -> Pipeline: ...  # type: ignore [override]
+    def hscan(self, name: _Key, cursor: int = ..., match: Text = ..., count: int = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def hscan_iter(self, name, match=..., count=...) -> Iterator[Any]: ...
-    def zscan(self, name, cursor=..., match=..., count=..., score_cast_func=...) -> Pipeline: ...  # type: ignore [override]
+    def zscan(self, name, cursor=..., match=..., count=..., score_cast_func=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def zscan_iter(self, name, match=..., count=..., score_cast_func=...) -> Iterator[Any]: ...
-    def sadd(self, name: _Key, *values: _Value) -> Pipeline: ...  # type: ignore [override]
-    def scard(self, name: _Key) -> Pipeline: ...  # type: ignore [override]
-    def sdiff(self, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline: ...  # type: ignore [override]
-    def sdiffstore(self, dest: _Key, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline: ...  # type: ignore [override]
-    def sinter(self, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline: ...  # type: ignore [override]
-    def sinterstore(self, dest: _Key, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline: ...  # type: ignore [override]
-    def sismember(self, name: _Key, value: _Value) -> Pipeline: ...  # type: ignore [override]
-    def smembers(self, name: _Key) -> Pipeline: ...  # type: ignore [override]
-    def smove(self, src: _Key, dst: _Key, value: _Value) -> Pipeline: ...  # type: ignore [override]
-    def spop(self, name: _Key, count: Optional[int] = ...) -> Pipeline: ...  # type: ignore [override]
-    def srandmember(self, name: _Key, number: Optional[int] = ...) -> Pipeline: ...  # type: ignore [override]
-    def srem(self, name: _Key, *values: _Value) -> Pipeline: ...  # type: ignore [override]
-    def sunion(self, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline: ...  # type: ignore [override]
-    def sunionstore(self, dest: _Key, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline: ...  # type: ignore [override]
-    def xack(self, name, groupname, *ids) -> Pipeline: ...  # type: ignore [override]
-    def xadd(self, name, fields, id=..., maxlen=..., approximate=...) -> Pipeline: ...  # type: ignore [override]
+    def sadd(self, name: _Key, *values: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def scard(self, name: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def sdiff(self, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def sdiffstore(self, dest: _Key, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def sinter(self, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def sinterstore(self, dest: _Key, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def sismember(self, name: _Key, value: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def smembers(self, name: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def smove(self, src: _Key, dst: _Key, value: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def spop(self, name: _Key, count: Optional[int] = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def srandmember(self, name: _Key, number: Optional[int] = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def srem(self, name: _Key, *values: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def sunion(self, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def sunionstore(self, dest: _Key, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xack(self, name, groupname, *ids) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xadd(self, name, fields, id=..., maxlen=..., approximate=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def xclaim(
         self, name, groupname, consumername, min_idle_time, message_ids, idle=..., time=..., retrycount=..., force=..., justid=...
-    ) -> Pipeline: ...  # type: ignore [override]
-    def xdel(self, name, *ids) -> Pipeline: ...  # type: ignore [override]
-    def xgroup_create(self, name, groupname, id=..., mkstream=...) -> Pipeline: ...  # type: ignore [override]
-    def xgroup_delconsumer(self, name, groupname, consumername) -> Pipeline: ...  # type: ignore [override]
-    def xgroup_destroy(self, name, groupname) -> Pipeline: ...  # type: ignore [override]
-    def xgroup_setid(self, name, groupname, id) -> Pipeline: ...  # type: ignore [override]
-    def xinfo_consumers(self, name, groupname) -> Pipeline: ...  # type: ignore [override]
-    def xinfo_groups(self, name) -> Pipeline: ...  # type: ignore [override]
-    def xinfo_stream(self, name) -> Pipeline: ...  # type: ignore [override]
-    def xlen(self, name: _Key) -> Pipeline: ...  # type: ignore [override]
-    def xpending(self, name, groupname) -> Pipeline: ...  # type: ignore [override]
-    def xpending_range(self, name, groupname, min, max, count, consumername=...) -> Pipeline: ...  # type: ignore [override]
-    def xrange(self, name, min=..., max=..., count=...) -> Pipeline: ...  # type: ignore [override]
-    def xread(self, streams, count=..., block=...) -> Pipeline: ...  # type: ignore [override]
-    def xreadgroup(self, groupname, consumername, streams, count=..., block=..., noack=...) -> Pipeline: ...  # type: ignore [override]
-    def xrevrange(self, name, max=..., min=..., count=...) -> Pipeline: ...  # type: ignore [override]
-    def xtrim(self, name, maxlen, approximate=...) -> Pipeline: ...  # type: ignore [override]
+    ) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xdel(self, name, *ids) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xgroup_create(self, name, groupname, id=..., mkstream=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xgroup_delconsumer(self, name, groupname, consumername) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xgroup_destroy(self, name, groupname) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xgroup_setid(self, name, groupname, id) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xinfo_consumers(self, name, groupname) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xinfo_groups(self, name) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xinfo_stream(self, name) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xlen(self, name: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xpending(self, name, groupname) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xpending_range(self, name, groupname, min, max, count, consumername=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xrange(self, name, min=..., max=..., count=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xread(self, streams, count=..., block=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xreadgroup(self, groupname, consumername, streams, count=..., block=..., noack=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xrevrange(self, name, max=..., min=..., count=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def xtrim(self, name, maxlen, approximate=...) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def zadd(  # type: ignore [override]
         self, name: _Key, mapping: Mapping[_Key, _Value], nx: bool = ..., xx: bool = ..., ch: bool = ..., incr: bool = ...
-    ) -> Pipeline: ...
-    def zcard(self, name: _Key) -> Pipeline: ...  # type: ignore [override]
-    def zcount(self, name: _Key, min: _Value, max: _Value) -> Pipeline: ...  # type: ignore [override]
-    def zincrby(self, name: _Key, value: _Value, amount: float = ...) -> Pipeline: ...  # type: ignore [override]
-    def zinterstore(self, dest: _Key, keys: Iterable[_Key], aggregate: Literal["SUM", "MIN", "MAX"] = ...) -> Pipeline: ...  # type: ignore [override]
-    def zlexcount(self, name: _Key, min: _Value, max: _Value) -> Pipeline: ...  # type: ignore [override]
-    def zpopmax(self, name: _Key, count: Optional[int] = ...) -> Pipeline: ...  # type: ignore [override]
-    def zpopmin(self, name: _Key, count: Optional[int] = ...) -> Pipeline: ...  # type: ignore [override]
-    def bzpopmax(self, keys: Union[_Key, Iterable[_Key]], timeout: float = ...) -> Pipeline: ...  # type: ignore [override]
-    def bzpopmin(self, keys: Union[_Key, Iterable[_Key]], timeout: float = ...) -> Pipeline: ...  # type: ignore [override]
+    ) -> Pipeline[_StrType]: ...
+    def zcard(self, name: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def zcount(self, name: _Key, min: _Value, max: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def zincrby(self, name: _Key, value: _Value, amount: float = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def zinterstore(self, dest: _Key, keys: Iterable[_Key], aggregate: Literal["SUM", "MIN", "MAX"] = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def zlexcount(self, name: _Key, min: _Value, max: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def zpopmax(self, name: _Key, count: Optional[int] = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def zpopmin(self, name: _Key, count: Optional[int] = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def bzpopmax(self, keys: Union[_Key, Iterable[_Key]], timeout: float = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def bzpopmin(self, keys: Union[_Key, Iterable[_Key]], timeout: float = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def zrange(  # type: ignore [override]
         self,
         name: _Key,
@@ -1062,8 +1062,8 @@ class Pipeline(Redis):
         desc: bool = ...,
         withscores: bool = ...,
         score_cast_func: Callable[[Any], Any] = ...,
-    ) -> Pipeline: ...
-    def zrangebylex(self, name: _Key, min: _Value, max: _Value, start: Optional[int] = ..., num: Optional[int] = ...) -> Pipeline: ...  # type: ignore [override]
+    ) -> Pipeline[_StrType]: ...
+    def zrangebylex(self, name: _Key, min: _Value, max: _Value, start: Optional[int] = ..., num: Optional[int] = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def zrangebyscore(  # type: ignore [override]
         self,
         name: _Key,
@@ -1073,12 +1073,12 @@ class Pipeline(Redis):
         num: Optional[int] = ...,
         withscores: bool = ...,
         score_cast_func: Callable[[Any], Any] = ...,
-    ) -> Pipeline: ...
-    def zrank(self, name: _Key, value: _Value) -> Pipeline: ...  # type: ignore [override]
-    def zrem(self, name: _Key, *values: _Value) -> Pipeline: ...  # type: ignore [override]
-    def zremrangebylex(self, name: _Key, min: _Value, max: _Value) -> Pipeline: ...  # type: ignore [override]
-    def zremrangebyrank(self, name: _Key, min: _Value, max: _Value) -> Pipeline: ...  # type: ignore [override]
-    def zremrangebyscore(self, name: _Key, min: _Value, max: _Value) -> Pipeline: ...  # type: ignore [override]
+    ) -> Pipeline[_StrType]: ...
+    def zrank(self, name: _Key, value: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def zrem(self, name: _Key, *values: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def zremrangebylex(self, name: _Key, min: _Value, max: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def zremrangebyrank(self, name: _Key, min: _Value, max: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def zremrangebyscore(self, name: _Key, min: _Value, max: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def zrevrange(  # type: ignore [override]
         self,
         name: _Key,
@@ -1087,7 +1087,7 @@ class Pipeline(Redis):
         desc: bool = ...,
         withscores: bool = ...,
         score_cast_func: Callable[[Any], Any] = ...,
-    ) -> Pipeline: ...
+    ) -> Pipeline[_StrType]: ...
     def zrevrangebyscore(  # type: ignore [override]
         self,
         name: _Key,
@@ -1097,47 +1097,49 @@ class Pipeline(Redis):
         num: Optional[int] = ...,
         withscores: bool = ...,
         score_cast_func: Callable[[Any], Any] = ...,
-    ) -> Pipeline: ...
+    ) -> Pipeline[_StrType]: ...
     def zrevrangebylex(  # type: ignore [override]
         self, name: _Key, min: _Value, max: _Value, start: Optional[int] = ..., num: Optional[int] = ...
-    ) -> Pipeline: ...
-    def zrevrank(self, name: _Key, value: _Value) -> Pipeline: ...  # type: ignore [override]
-    def zscore(self, name: _Key, value: _Value) -> Pipeline: ...  # type: ignore [override]
-    def zunionstore(self, dest: _Key, keys: Iterable[_Key], aggregate: Literal["SUM", "MIN", "MAX"] = ...) -> Pipeline: ...  # type: ignore [override]
-    def pfadd(self, name: _Key, *values: _Value) -> Pipeline: ...  # type: ignore [override]
-    def pfcount(self, name: _Key) -> Pipeline: ...  # type: ignore [override]
-    def pfmerge(self, dest: _Key, *sources: _Key) -> Pipeline: ...  # type: ignore [override]
-    def hdel(self, name: _Key, *keys: _Key) -> Pipeline: ...  # type: ignore [override]
-    def hexists(self, name: _Key, key: _Key) -> Pipeline: ...  # type: ignore [override]
-    def hget(self, name: _Key, key: _Key) -> Pipeline: ...  # type: ignore [override]
-    def hgetall(self, name: _Key) -> Pipeline: ...  # type: ignore [override]
-    def hincrby(self, name: _Key, key: _Key, amount: int = ...) -> Pipeline: ...  # type: ignore [override]
-    def hincrbyfloat(self, name: _Key, key: _Key, amount: float = ...) -> Pipeline: ...  # type: ignore [override]
-    def hkeys(self, name: _Key) -> Pipeline: ...  # type: ignore [override]
-    def hlen(self, name: _Key) -> Pipeline: ...  # type: ignore [override]
+    ) -> Pipeline[_StrType]: ...
+    def zrevrank(self, name: _Key, value: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def zscore(self, name: _Key, value: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def zunionstore(self, dest: _Key, keys: Iterable[_Key], aggregate: Literal["SUM", "MIN", "MAX"] = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def pfadd(self, name: _Key, *values: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def pfcount(self, name: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def pfmerge(self, dest: _Key, *sources: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def hdel(self, name: _Key, *keys: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def hexists(self, name: _Key, key: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def hget(self, name: _Key, key: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def hgetall(self, name: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def hincrby(self, name: _Key, key: _Key, amount: int = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def hincrbyfloat(self, name: _Key, key: _Key, amount: float = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def hkeys(self, name: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def hlen(self, name: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
     @overload  # type: ignore [override]
-    def hset(self, name: _Key, key: _Key, value: _Value, mapping: Optional[Mapping[_Key, _Value]] = ...) -> Pipeline: ...
+    def hset(
+        self, name: _Key, key: _Key, value: _Value, mapping: Optional[Mapping[_Key, _Value]] = ...
+    ) -> Pipeline[_StrType]: ...
     @overload  # type: ignore [override]
-    def hset(self, name: _Key, key: None, value: None, mapping: Mapping[_Key, _Value]) -> Pipeline: ...
+    def hset(self, name: _Key, key: None, value: None, mapping: Mapping[_Key, _Value]) -> Pipeline[_StrType]: ...
     @overload  # type: ignore [override]
-    def hset(self, name: _Key, *, mapping: Mapping[_Key, _Value]) -> Pipeline: ...
-    def hsetnx(self, name: _Key, key: _Key, value: _Value) -> Pipeline: ...  # type: ignore [override]
-    def hmset(self, name: _Key, mapping: Mapping[_Key, _Value]) -> Pipeline: ...  # type: ignore [override]
-    def hmget(self, name: _Key, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline: ...  # type: ignore [override]
-    def hvals(self, name: _Key) -> Pipeline: ...  # type: ignore [override]
-    def publish(self, channel: _Key, message: _Key) -> Pipeline: ...  # type: ignore [override]
-    def eval(self, script, numkeys, *keys_and_args) -> Pipeline: ...  # type: ignore [override]
-    def evalsha(self, sha, numkeys, *keys_and_args) -> Pipeline: ...  # type: ignore [override]
-    def script_exists(self, *args) -> Pipeline: ...  # type: ignore [override]
-    def script_flush(self) -> Pipeline: ...  # type: ignore [override]
-    def script_kill(self) -> Pipeline: ...  # type: ignore [override]
-    def script_load(self, script) -> Pipeline: ...  # type: ignore [override]
+    def hset(self, name: _Key, *, mapping: Mapping[_Key, _Value]) -> Pipeline[_StrType]: ...
+    def hsetnx(self, name: _Key, key: _Key, value: _Value) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def hmset(self, name: _Key, mapping: Mapping[_Key, _Value]) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def hmget(self, name: _Key, keys: Union[_Key, Iterable[_Key]], *args: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def hvals(self, name: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def publish(self, channel: _Key, message: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def eval(self, script, numkeys, *keys_and_args) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def evalsha(self, sha, numkeys, *keys_and_args) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def script_exists(self, *args) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def script_flush(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def script_kill(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def script_load(self, script) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def register_script(self, script: Union[Text, _StrType]) -> Script: ...
-    def pubsub_channels(self, pattern: _Key = ...) -> Pipeline: ...  # type: ignore [override]
-    def pubsub_numsub(self, *args: _Key) -> Pipeline: ...  # type: ignore [override]
-    def pubsub_numpat(self) -> Pipeline: ...  # type: ignore [override]
+    def pubsub_channels(self, pattern: _Key = ...) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def pubsub_numsub(self, *args: _Key) -> Pipeline[_StrType]: ...  # type: ignore [override]
+    def pubsub_numpat(self) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def monitor(self) -> Monitor: ...
-    def cluster(self, cluster_arg: str, *args: Any) -> Pipeline: ...  # type: ignore [override]
+    def cluster(self, cluster_arg: str, *args: Any) -> Pipeline[_StrType]: ...  # type: ignore [override]
     def client(self) -> Any: ...
 
 class Script:

stubs/redis/redis/lock.pyi

@@ -1,5 +1,5 @@
 from types import TracebackType
-from typing import Optional, Text, Type, Union
+from typing import Any, Optional, Text, Type, Union
 
 from redis.client import Redis
 
@@ -8,7 +8,7 @@ _TokenValue = Union[bytes, Text]
 class Lock:
     def __init__(
         self,
-        redis: Redis,
+        redis: Redis[Any],
         name: str,
         timeout: Union[None, int, float] = ...,
         sleep: float = ...,

stubs/redis/redis/utils.pyi

@@ -1,7 +1,7 @@
 from typing import Any, ContextManager, Optional, Text, TypeVar, overload
 from typing_extensions import Literal
 
-from .client import Pipeline, Redis
+from .client import Pipeline, Redis, _StrType
 
 _T = TypeVar("_T")
 
@@ -16,6 +16,6 @@ def str_if_bytes(value: bytes) -> str: ...  # type: ignore
 @overload
 def str_if_bytes(value: _T) -> _T: ...
 def safe_str(value: object) -> str: ...
-def pipeline(redis_obj: Redis) -> ContextManager[Pipeline]: ...
+def pipeline(redis_obj: Redis[_StrType]) -> ContextManager[Pipeline[_StrType]]: ...
 
 class dummy: ...

stubs/requests/requests/auth.pyi

@@ -1,6 +1,6 @@
 from typing import Any, Text, Union
 
-from . import cookies, models, status_codes, utils
+from . import cookies, models, utils
 
 extract_cookies_to_jar = cookies.extract_cookies_to_jar
 parse_dict_header = utils.parse_dict_header

stubs/requests/requests/sessions.pyi

@@ -43,7 +43,7 @@ class SessionRedirectMixin:
     def rebuild_proxies(self, prepared_request, proxies): ...
     def should_strip_auth(self, old_url, new_url): ...
 
-_Data = Union[None, Text, bytes, Mapping[str, Any], Mapping[Text, Any], Iterable[Tuple[Text, Optional[Text]]], IO]
+_Data = Union[None, Text, bytes, Mapping[str, Any], Mapping[Text, Any], Iterable[Tuple[Text, Optional[Text]]], IO[Any]]
 
 _Hook = Callable[[Response], Any]
 _Hooks = MutableMapping[Text, List[_Hook]]

stubs/waitress/waitress/proxy_headers.pyi

@@ -1,12 +1,15 @@
-from collections import namedtuple
 from logging import Logger
-from typing import Any, Callable, Mapping, Optional, Sequence, Set
+from typing import Any, Callable, Mapping, NamedTuple, Optional, Sequence, Set
 
 from .utilities import BadRequest as BadRequest
 
-PROXY_HEADERS: frozenset
+PROXY_HEADERS: frozenset[Any]
 
-Forwarded = namedtuple("Forwarded", ["by", "for_", "host", "proto"])
+class Forwarded(NamedTuple):
+    by: Any
+    for_: Any
+    host: Any
+    proto: Any
 
 class MalformedProxyHeader(Exception):
     header: str = ...

stubs/waitress/waitress/rfc7230.pyi

@@ -1,4 +1,4 @@
-from typing import Pattern
+from typing import Any, Pattern
 
 from .compat import tobytes as tobytes
 
@@ -13,4 +13,4 @@ VCHAR: str
 FIELD_VCHAR: str
 FIELD_CONTENT: str
 FIELD_VALUE: str
-HEADER_FIELD: Pattern
+HEADER_FIELD: Pattern[Any]

stubs/waitress/waitress/runner.pyi

@@ -2,7 +2,7 @@ from io import TextIOWrapper
 from typing import Any, Callable, Optional, Pattern, Sequence, Tuple
 
 HELP: str
-RUNNER_PATTERN: Pattern
+RUNNER_PATTERN: Pattern[Any]
 
 def match(obj_name: str) -> Tuple[str, str]: ...
 def resolve(module_name: str, object_name: str) -> Any: ...

stubs/waitress/waitress/task.pyi

@@ -1,19 +1,19 @@
 from logging import Logger
 from threading import Condition, Lock
-from typing import Any, Deque, Mapping, Optional, Sequence, Set, Tuple
+from typing import Any, Deque, Mapping, Optional, Sequence, Tuple
 
 from .channel import HTTPChannel
 from .utilities import Error
 
 rename_headers: Mapping[str, str]
-hop_by_hop: frozenset
+hop_by_hop: frozenset[Any]
 
 class ThreadedTaskDispatcher:
     stop_count: int = ...
     active_count: int = ...
     logger: Logger = ...
     queue_logger: Logger = ...
-    threads: Set = ...
+    threads: set[Any] = ...
     queue: Deque[Task] = ...
     lock: Lock = ...
     queue_cv: Condition = ...

stubs/waitress/waitress/utilities.pyi

@@ -21,14 +21,14 @@ months: Sequence[str]
 monmap: Mapping[str, int]
 months_reg: str
 rfc822_date: str
-rfc822_reg: Pattern
+rfc822_reg: Pattern[Any]
 
-def unpack_rfc822(m: Match) -> Tuple[int, int, int, int, int, int, int, int, int]: ...
+def unpack_rfc822(m: Match[Any]) -> Tuple[int, int, int, int, int, int, int, int, int]: ...
 
 rfc850_date: str
-rfc850_reg: Pattern
+rfc850_reg: Pattern[Any]
 
-def unpack_rfc850(m: Match) -> Tuple[int, int, int, int, int, int, int, int, int]: ...
+def unpack_rfc850(m: Match[Any]) -> Tuple[int, int, int, int, int, int, int, int, int]: ...
 
 weekdayname: Sequence[str]
 monthname: Sequence[str]
@@ -41,8 +41,8 @@ obs_text_re: str
 qdtext_re: str
 quoted_pair_re: str
 quoted_string_re: str
-quoted_string: Pattern
-quoted_pair: Pattern
+quoted_string: Pattern[Any]
+quoted_pair: Pattern[Any]
 
 def undquote(value: str) -> str: ...
 def cleanup_unix_socket(path: str) -> None: ...

stubs/waitress/waitress/wasyncore.pyi

@@ -32,7 +32,7 @@ class dispatcher:
     connecting: bool = ...
     closing: bool = ...
     addr: Optional[Tuple[str, int]] = ...
-    ignore_log_types: frozenset = ...
+    ignore_log_types: frozenset[Any]
     logger: Logger = ...
     compact_traceback: Callable[[], Tuple[Tuple[str, str, str], BaseException, BaseException, str]] = ...
     socket: Optional[_socket] = ...