Akuli and srittau: Remove Python 2 branches from Python 3 stubs (#5461)

* run script and do some manual changes (Akuli) * do the whole thing manually (srittau) * merge changes (Akuli) Co-authored-by: Sebastian Rittau <srittau@rittau.biz>
2025-12-09 05:24:52 +08:00 · 2021-05-15 15:33:39 +03:00
parent b0ef85288d
commit 17dcea4a68
106 changed files with 1539 additions and 3275 deletions
--- a/stdlib/ssl.pyi
+++ b/stdlib/ssl.pyi
@@ -1,12 +1,10 @@
+import enum
 import socket
 import sys
 from _typeshed import StrPath
-from typing import Any, Callable, ClassVar, Dict, Iterable, List, NamedTuple, Optional, Set, Text, Tuple, Type, Union, overload
+from typing import Any, Callable, Dict, Iterable, List, NamedTuple, Optional, Set, Text, Tuple, Type, Union, overload
 from typing_extensions import Literal

-if sys.version_info >= (3, 4):
-    import enum
-
 _PCTRTT = Tuple[Tuple[str, str], ...]
 _PCTRTTT = Tuple[_PCTRTT, ...]
 _PeerCertRetDictType = Dict[str, Union[str, _PCTRTTT, _PCTRTT]]
@@ -14,10 +12,7 @@ _PeerCertRetType = Union[_PeerCertRetDictType, bytes, None]
 _EnumRetType = List[Tuple[bytes, str, Union[Set[str], bool]]]
 _PasswordType = Union[Callable[[], Union[str, bytes]], str, bytes]

-if sys.version_info >= (3, 5):
-    _SC1ArgT = Union[SSLSocket, SSLObject]
-else:
-    _SC1ArgT = SSLSocket
+_SC1ArgT = Union[SSLSocket, SSLObject]
 _SrvnmeCbType = Callable[[_SC1ArgT, Optional[str], SSLSocket], Optional[int]]

 class SSLError(OSError):
@@ -84,10 +79,8 @@ else:

 _create_default_https_context: Callable[..., SSLContext]

-if sys.version_info >= (3, 3):
-    def RAND_bytes(__num: int) -> bytes: ...
-    def RAND_pseudo_bytes(__num: int) -> Tuple[bytes, bool]: ...
-
+def RAND_bytes(__num: int) -> bytes: ...
+def RAND_pseudo_bytes(__num: int) -> Tuple[bytes, bool]: ...
 def RAND_status() -> bool: ...
 def RAND_egd(path: str) -> None: ...
 def RAND_add(__s: bytes, __entropy: float) -> None: ...
@@ -128,55 +121,43 @@ PROTOCOL_TLSv1: int
 PROTOCOL_TLSv1_1: int
 PROTOCOL_TLSv1_2: int
 PROTOCOL_TLS: int
-if sys.version_info >= (3, 6):
-    PROTOCOL_TLS_CLIENT: int
-    PROTOCOL_TLS_SERVER: int
+PROTOCOL_TLS_CLIENT: int
+PROTOCOL_TLS_SERVER: int

-if sys.version_info >= (3, 6):
-    class Options(enum.IntFlag):
-        OP_ALL: int
-        OP_NO_SSLv2: int
-        OP_NO_SSLv3: int
-        OP_NO_TLSv1: int
-        OP_NO_TLSv1_1: int
-        OP_NO_TLSv1_2: int
-        OP_NO_TLSv1_3: int
-        OP_CIPHER_SERVER_PREFERENCE: int
-        OP_SINGLE_DH_USE: int
-        OP_SINGLE_ECDH_USE: int
-        OP_NO_COMPRESSION: int
-        OP_NO_TICKET: int
-        if sys.version_info >= (3, 7):
-            OP_NO_RENEGOTIATION: int
-        if sys.version_info >= (3, 8):
-            OP_ENABLE_MIDDLEBOX_COMPAT: int
-    OP_ALL: Options
-    OP_NO_SSLv2: Options
-    OP_NO_SSLv3: Options
-    OP_NO_TLSv1: Options
-    OP_NO_TLSv1_1: Options
-    OP_NO_TLSv1_2: Options
-    OP_NO_TLSv1_3: Options
-    OP_CIPHER_SERVER_PREFERENCE: Options
-    OP_SINGLE_DH_USE: Options
-    OP_SINGLE_ECDH_USE: Options
-    OP_NO_COMPRESSION: Options
-    OP_NO_TICKET: Options
-    if sys.version_info >= (3, 7):
-        OP_NO_RENEGOTIATION: Options
-    if sys.version_info >= (3, 8):
-        OP_ENABLE_MIDDLEBOX_COMPAT: Options
-else:
+class Options(enum.IntFlag):
    OP_ALL: int
    OP_NO_SSLv2: int
    OP_NO_SSLv3: int
    OP_NO_TLSv1: int
    OP_NO_TLSv1_1: int
    OP_NO_TLSv1_2: int
+    OP_NO_TLSv1_3: int
    OP_CIPHER_SERVER_PREFERENCE: int
    OP_SINGLE_DH_USE: int
    OP_SINGLE_ECDH_USE: int
    OP_NO_COMPRESSION: int
+    OP_NO_TICKET: int
+    if sys.version_info >= (3, 7):
+        OP_NO_RENEGOTIATION: int
+    if sys.version_info >= (3, 8):
+        OP_ENABLE_MIDDLEBOX_COMPAT: int
+
+OP_ALL: Options
+OP_NO_SSLv2: Options
+OP_NO_SSLv3: Options
+OP_NO_TLSv1: Options
+OP_NO_TLSv1_1: Options
+OP_NO_TLSv1_2: Options
+OP_NO_TLSv1_3: Options
+OP_CIPHER_SERVER_PREFERENCE: Options
+OP_SINGLE_DH_USE: Options
+OP_SINGLE_ECDH_USE: Options
+OP_NO_COMPRESSION: Options
+OP_NO_TICKET: Options
+if sys.version_info >= (3, 7):
+    OP_NO_RENEGOTIATION: Options
+if sys.version_info >= (3, 8):
+    OP_ENABLE_MIDDLEBOX_COMPAT: Options

 if sys.version_info >= (3, 7):
    HAS_NEVER_CHECK_COMMON_NAME: bool
@@ -230,23 +211,16 @@ class _ASN1Object(NamedTuple):
    longname: str
    oid: str

-if sys.version_info >= (3, 4):
-    class Purpose(_ASN1Object, enum.Enum):
-        SERVER_AUTH: _ASN1Object
-        CLIENT_AUTH: _ASN1Object
-
-else:
-    class Purpose(_ASN1Object):
-        SERVER_AUTH: ClassVar[Purpose]
-        CLIENT_AUTH: ClassVar[Purpose]
+class Purpose(_ASN1Object, enum.Enum):
+    SERVER_AUTH: _ASN1Object
+    CLIENT_AUTH: _ASN1Object

 class SSLSocket(socket.socket):
    context: SSLContext
    server_side: bool
    server_hostname: Optional[str]
-    if sys.version_info >= (3, 6):
-        session: Optional[SSLSession]
-        session_reused: Optional[bool]
+    session: Optional[SSLSession]
+    session_reused: Optional[bool]
    if sys.version_info < (3, 7):
        def __init__(
            self,
@@ -293,8 +267,7 @@ class SSLSocket(socket.socket):
    @overload
    def getpeercert(self, binary_form: bool) -> _PeerCertRetType: ...
    def cipher(self) -> Optional[Tuple[str, str, int]]: ...
-    if sys.version_info >= (3, 5):
-        def shared_ciphers(self) -> Optional[List[Tuple[str, str, int]]]: ...
+    def shared_ciphers(self) -> Optional[List[Tuple[str, str, int]]]: ...
    def compression(self) -> Optional[str]: ...
    def get_channel_binding(self, cb_type: str = ...) -> Optional[bytes]: ...
    def selected_alpn_protocol(self) -> Optional[str]: ...
@@ -318,24 +291,15 @@ if sys.version_info >= (3, 7):

 class SSLContext:
    check_hostname: bool
-    if sys.version_info >= (3, 6):
-        options: Options
-    else:
-        options: int
+    options: Options
    if sys.version_info >= (3, 8):
        post_handshake_auth: bool
-    if sys.version_info >= (3, 5):
-        def __new__(cls, protocol: int = ..., *args: Any, **kwargs: Any) -> SSLContext: ...
-    else:
-        def __new__(cls, protocol: int, *args: Any, **kwargs: Any) -> SSLContext: ...
+    def __new__(cls, protocol: int = ..., *args: Any, **kwargs: Any) -> SSLContext: ...
    @property
    def protocol(self) -> int: ...
    verify_flags: int
    verify_mode: int
-    if sys.version_info >= (3, 5):
-        def __init__(self, protocol: int = ...) -> None: ...
-    else:
-        def __init__(self, protocol: int) -> None: ...
+    def __init__(self, protocol: int = ...) -> None: ...
    def cert_store_stats(self) -> Dict[str, int]: ...
    def load_cert_chain(
        self, certfile: StrPath, keyfile: Optional[StrPath] = ..., password: Optional[_PasswordType] = ...
@@ -358,102 +322,87 @@ class SSLContext:
        def set_servername_callback(self, __method: Optional[_SrvnmeCbType]) -> None: ...
    def load_dh_params(self, __path: str) -> None: ...
    def set_ecdh_curve(self, __name: str) -> None: ...
-    if sys.version_info >= (3, 6):
-        def wrap_socket(
-            self,
-            sock: socket.socket,
-            server_side: bool = ...,
-            do_handshake_on_connect: bool = ...,
-            suppress_ragged_eofs: bool = ...,
-            server_hostname: Optional[str] = ...,
-            session: Optional[SSLSession] = ...,
-        ) -> SSLSocket: ...
-    else:
-        def wrap_socket(
-            self,
-            sock: socket.socket,
-            server_side: bool = ...,
-            do_handshake_on_connect: bool = ...,
-            suppress_ragged_eofs: bool = ...,
-            server_hostname: Optional[str] = ...,
-        ) -> SSLSocket: ...
-    if sys.version_info >= (3, 6):
-        def wrap_bio(
-            self,
-            incoming: MemoryBIO,
-            outgoing: MemoryBIO,
-            server_side: bool = ...,
-            server_hostname: Optional[str] = ...,
-            session: Optional[SSLSession] = ...,
-        ) -> SSLObject: ...
-    elif sys.version_info >= (3, 5):
-        def wrap_bio(
-            self, incoming: MemoryBIO, outgoing: MemoryBIO, server_side: bool = ..., server_hostname: Optional[str] = ...
-        ) -> SSLObject: ...
+    def wrap_socket(
+        self,
+        sock: socket.socket,
+        server_side: bool = ...,
+        do_handshake_on_connect: bool = ...,
+        suppress_ragged_eofs: bool = ...,
+        server_hostname: Optional[str] = ...,
+        session: Optional[SSLSession] = ...,
+    ) -> SSLSocket: ...
+    def wrap_bio(
+        self,
+        incoming: MemoryBIO,
+        outgoing: MemoryBIO,
+        server_side: bool = ...,
+        server_hostname: Optional[str] = ...,
+        session: Optional[SSLSession] = ...,
+    ) -> SSLObject: ...
    def session_stats(self) -> Dict[str, int]: ...
    if sys.version_info >= (3, 7):
        hostname_checks_common_name: bool
        maximum_version: TLSVersion
        minimum_version: TLSVersion

-if sys.version_info >= (3, 5):
-    class SSLObject:
-        context: SSLContext
-        server_side: bool
-        server_hostname: Optional[str]
-        if sys.version_info >= (3, 6):
-            session: Optional[SSLSession]
-            session_reused: bool
-        if sys.version_info >= (3, 7):
-            def __init__(self, *args: Any, **kwargs: Any) -> None: ...
-        else:
-            def __init__(
-                self, sslobj: Any, owner: Optional[Union[SSLSocket, SSLObject]] = ..., session: Optional[Any] = ...
-            ) -> None: ...
-        def read(self, len: int = ..., buffer: Optional[bytearray] = ...) -> bytes: ...
-        def write(self, data: bytes) -> int: ...
-        @overload
-        def getpeercert(self, binary_form: Literal[False] = ...) -> Optional[_PeerCertRetDictType]: ...
-        @overload
-        def getpeercert(self, binary_form: Literal[True]) -> Optional[bytes]: ...
-        @overload
-        def getpeercert(self, binary_form: bool) -> _PeerCertRetType: ...
-        def selected_alpn_protocol(self) -> Optional[str]: ...
-        def selected_npn_protocol(self) -> Optional[str]: ...
-        def cipher(self) -> Optional[Tuple[str, str, int]]: ...
-        def shared_ciphers(self) -> Optional[List[Tuple[str, str, int]]]: ...
-        def compression(self) -> Optional[str]: ...
-        def pending(self) -> int: ...
-        def do_handshake(self) -> None: ...
-        def unwrap(self) -> None: ...
-        def version(self) -> Optional[str]: ...
-        def get_channel_binding(self, cb_type: str = ...) -> Optional[bytes]: ...
-        if sys.version_info >= (3, 8):
-            def verify_client_post_handshake(self) -> None: ...
-    class MemoryBIO:
-        pending: int
-        eof: bool
-        def read(self, __size: int = ...) -> bytes: ...
-        def write(self, __buf: bytes) -> int: ...
-        def write_eof(self) -> None: ...
+class SSLObject:
+    context: SSLContext
+    server_side: bool
+    server_hostname: Optional[str]
+    session: Optional[SSLSession]
+    session_reused: bool
+    if sys.version_info >= (3, 7):
+        def __init__(self, *args: Any, **kwargs: Any) -> None: ...
+    else:
+        def __init__(
+            self, sslobj: Any, owner: Optional[Union[SSLSocket, SSLObject]] = ..., session: Optional[Any] = ...
+        ) -> None: ...
+    def read(self, len: int = ..., buffer: Optional[bytearray] = ...) -> bytes: ...
+    def write(self, data: bytes) -> int: ...
+    @overload
+    def getpeercert(self, binary_form: Literal[False] = ...) -> Optional[_PeerCertRetDictType]: ...
+    @overload
+    def getpeercert(self, binary_form: Literal[True]) -> Optional[bytes]: ...
+    @overload
+    def getpeercert(self, binary_form: bool) -> _PeerCertRetType: ...
+    def selected_alpn_protocol(self) -> Optional[str]: ...
+    def selected_npn_protocol(self) -> Optional[str]: ...
+    def cipher(self) -> Optional[Tuple[str, str, int]]: ...
+    def shared_ciphers(self) -> Optional[List[Tuple[str, str, int]]]: ...
+    def compression(self) -> Optional[str]: ...
+    def pending(self) -> int: ...
+    def do_handshake(self) -> None: ...
+    def unwrap(self) -> None: ...
+    def version(self) -> Optional[str]: ...
+    def get_channel_binding(self, cb_type: str = ...) -> Optional[bytes]: ...
+    if sys.version_info >= (3, 8):
+        def verify_client_post_handshake(self) -> None: ...

-if sys.version_info >= (3, 6):
-    class SSLSession:
-        id: bytes
-        time: int
-        timeout: int
-        ticket_lifetime_hint: int
-        has_ticket: bool
-    class VerifyFlags(enum.IntFlag):
-        VERIFY_DEFAULT: int
-        VERIFY_CRL_CHECK_LEAF: int
-        VERIFY_CRL_CHECK_CHAIN: int
-        VERIFY_X509_STRICT: int
-        VERIFY_X509_TRUSTED_FIRST: int
-    class VerifyMode(enum.IntEnum):
-        CERT_NONE: int
-        CERT_OPTIONAL: int
-        CERT_REQUIRED: int
+class MemoryBIO:
+    pending: int
+    eof: bool
+    def read(self, __size: int = ...) -> bytes: ...
+    def write(self, __buf: bytes) -> int: ...
+    def write_eof(self) -> None: ...
+
+class SSLSession:
+    id: bytes
+    time: int
+    timeout: int
+    ticket_lifetime_hint: int
+    has_ticket: bool
+
+class VerifyFlags(enum.IntFlag):
+    VERIFY_DEFAULT: int
+    VERIFY_CRL_CHECK_LEAF: int
+    VERIFY_CRL_CHECK_CHAIN: int
+    VERIFY_X509_STRICT: int
+    VERIFY_X509_TRUSTED_FIRST: int
+
+class VerifyMode(enum.IntEnum):
+    CERT_NONE: int
+    CERT_OPTIONAL: int
+    CERT_REQUIRED: int

 # TODO below documented in cpython but not in docs.python.org
 # taken from python 3.4