Switch to PEP-604 syntax in python2 stubs (#5915)

Signed-off-by: oleg.hoefling <oleg.hoefling@gmail.com>
This commit is contained in:
Oleg Höfling
2021-08-14 11:12:30 +02:00
committed by GitHub
parent 431c4f7fc1
commit ff63953188
235 changed files with 2473 additions and 2768 deletions

View File

@@ -27,30 +27,30 @@ class CertificateError(ValueError): ...
def wrap_socket(
sock: socket.socket,
keyfile: Optional[str] = ...,
certfile: Optional[str] = ...,
keyfile: str | None = ...,
certfile: str | None = ...,
server_side: bool = ...,
cert_reqs: int = ...,
ssl_version: int = ...,
ca_certs: Optional[str] = ...,
ca_certs: str | None = ...,
do_handshake_on_connect: bool = ...,
suppress_ragged_eofs: bool = ...,
ciphers: Optional[str] = ...,
ciphers: str | None = ...,
) -> SSLSocket: ...
def create_default_context(
purpose: Any = ..., *, cafile: Optional[str] = ..., capath: Optional[str] = ..., cadata: Union[Text, bytes, None] = ...
purpose: Any = ..., *, cafile: str | None = ..., capath: str | None = ..., cadata: Text | bytes | None = ...
) -> SSLContext: ...
def _create_unverified_context(
protocol: int = ...,
*,
cert_reqs: Optional[int] = ...,
cert_reqs: int | None = ...,
check_hostname: bool = ...,
purpose: Any = ...,
certfile: Optional[str] = ...,
keyfile: Optional[str] = ...,
cafile: Optional[str] = ...,
capath: Optional[str] = ...,
cadata: Union[Text, bytes, None] = ...,
certfile: str | None = ...,
keyfile: str | None = ...,
cafile: str | None = ...,
capath: str | None = ...,
cadata: Text | bytes | None = ...,
) -> SSLContext: ...
_create_default_https_context: Callable[..., SSLContext]
@@ -60,7 +60,7 @@ def RAND_egd(path: str) -> None: ...
def RAND_add(__s: bytes, __entropy: float) -> None: ...
def match_hostname(cert: _PeerCertRetType, hostname: str) -> None: ...
def cert_time_to_seconds(cert_time: str) -> int: ...
def get_server_certificate(addr: Tuple[str, int], ssl_version: int = ..., ca_certs: Optional[str] = ...) -> str: ...
def get_server_certificate(addr: Tuple[str, int], ssl_version: int = ..., ca_certs: str | None = ...) -> str: ...
def DER_cert_to_PEM_cert(der_cert_bytes: bytes) -> str: ...
def PEM_cert_to_DER_cert(pem_cert_string: str) -> bytes: ...
@@ -157,57 +157,57 @@ class Purpose(_ASN1Object):
class SSLSocket(socket.socket):
context: SSLContext
server_side: bool
server_hostname: Optional[str]
server_hostname: str | None
def __init__(
self,
sock: Optional[socket.socket] = ...,
keyfile: Optional[str] = ...,
certfile: Optional[str] = ...,
sock: socket.socket | None = ...,
keyfile: str | None = ...,
certfile: str | None = ...,
server_side: bool = ...,
cert_reqs: int = ...,
ssl_version: int = ...,
ca_certs: Optional[str] = ...,
ca_certs: str | None = ...,
do_handshake_on_connect: bool = ...,
family: int = ...,
type: int = ...,
proto: int = ...,
fileno: Optional[int] = ...,
fileno: int | None = ...,
suppress_ragged_eofs: bool = ...,
npn_protocols: Optional[Iterable[str]] = ...,
ciphers: Optional[str] = ...,
server_hostname: Optional[str] = ...,
_context: Optional[SSLContext] = ...,
_session: Optional[Any] = ...,
npn_protocols: Iterable[str] | None = ...,
ciphers: str | None = ...,
server_hostname: str | None = ...,
_context: SSLContext | None = ...,
_session: Any | None = ...,
) -> None: ...
def connect(self, addr: Union[socket._Address, bytes]) -> None: ...
def connect_ex(self, addr: Union[socket._Address, bytes]) -> int: ...
def connect(self, addr: socket._Address | bytes) -> None: ...
def connect_ex(self, addr: socket._Address | bytes) -> int: ...
def recv(self, buflen: int = ..., flags: int = ...) -> bytes: ...
def recv_into(self, buffer: socket._WriteBuffer, nbytes: Optional[int] = ..., flags: int = ...) -> int: ...
def recv_into(self, buffer: socket._WriteBuffer, nbytes: int | None = ..., flags: int = ...) -> int: ...
def recvfrom(self, buflen: int = ..., flags: int = ...) -> tuple[bytes, socket._RetAddress]: ...
def recvfrom_into(
self, buffer: socket._WriteBuffer, nbytes: Optional[int] = ..., flags: int = ...
self, buffer: socket._WriteBuffer, nbytes: int | None = ..., flags: int = ...
) -> tuple[int, socket._RetAddress]: ...
@overload
def sendto(self, data: bytes, flags_or_addr: socket._Address) -> int: ...
@overload
def sendto(self, data: bytes, flags_or_addr: Union[int, socket._Address], addr: Optional[socket._Address] = ...) -> int: ...
def read(self, len: int = ..., buffer: Optional[bytearray] = ...) -> bytes: ...
def sendto(self, data: bytes, flags_or_addr: int | socket._Address, addr: socket._Address | None = ...) -> int: ...
def read(self, len: int = ..., buffer: bytearray | None = ...) -> bytes: ...
def write(self, data: bytes) -> int: ...
def do_handshake(self, block: bool = ...) -> None: ... # block is undocumented
@overload
def getpeercert(self, binary_form: Literal[False] = ...) -> Optional[_PeerCertRetDictType]: ...
def getpeercert(self, binary_form: Literal[False] = ...) -> _PeerCertRetDictType | None: ...
@overload
def getpeercert(self, binary_form: Literal[True]) -> Optional[bytes]: ...
def getpeercert(self, binary_form: Literal[True]) -> bytes | None: ...
@overload
def getpeercert(self, binary_form: bool) -> _PeerCertRetType: ...
def cipher(self) -> Optional[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]: ...
def selected_npn_protocol(self) -> Optional[str]: ...
def cipher(self) -> Tuple[str, str, int] | None: ...
def compression(self) -> str | None: ...
def get_channel_binding(self, cb_type: str = ...) -> bytes | None: ...
def selected_alpn_protocol(self) -> str | None: ...
def selected_npn_protocol(self) -> str | None: ...
def accept(self) -> Tuple[SSLSocket, socket._RetAddress]: ...
def unwrap(self) -> socket.socket: ...
def version(self) -> Optional[str]: ...
def version(self) -> str | None: ...
def pending(self) -> int: ...
class SSLContext:
@@ -220,19 +220,17 @@ class SSLContext:
verify_mode: int
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] = ...
) -> None: ...
def load_cert_chain(self, certfile: StrPath, keyfile: StrPath | None = ..., password: _PasswordType | None = ...) -> None: ...
def load_default_certs(self, purpose: Purpose = ...) -> None: ...
def load_verify_locations(
self, cafile: Optional[StrPath] = ..., capath: Optional[StrPath] = ..., cadata: Union[Text, bytes, None] = ...
self, cafile: StrPath | None = ..., capath: StrPath | None = ..., cadata: Text | bytes | None = ...
) -> None: ...
def get_ca_certs(self, binary_form: bool = ...) -> Union[List[_PeerCertRetDictType], List[bytes]]: ...
def get_ca_certs(self, binary_form: bool = ...) -> List[_PeerCertRetDictType] | List[bytes]: ...
def set_default_verify_paths(self) -> None: ...
def set_ciphers(self, __cipherlist: str) -> None: ...
def set_alpn_protocols(self, alpn_protocols: Iterable[str]) -> None: ...
def set_npn_protocols(self, npn_protocols: Iterable[str]) -> None: ...
def set_servername_callback(self, __method: Optional[_SrvnmeCbType]) -> None: ...
def set_servername_callback(self, __method: _SrvnmeCbType | None) -> None: ...
def load_dh_params(self, __path: str) -> None: ...
def set_ecdh_curve(self, __name: str) -> None: ...
def wrap_socket(
@@ -241,7 +239,7 @@ class SSLContext:
server_side: bool = ...,
do_handshake_on_connect: bool = ...,
suppress_ragged_eofs: bool = ...,
server_hostname: Optional[str] = ...,
server_hostname: str | None = ...,
) -> SSLSocket: ...
def session_stats(self) -> Dict[str, int]: ...