From 6aa6722fe167f880d1a1965648bada987ef073ca Mon Sep 17 00:00:00 2001 From: Manfred Kaiser <37737811+manfred-kaiser@users.noreply.github.com> Date: Tue, 2 Jan 2024 09:45:43 +0100 Subject: [PATCH] Update type hints for paramiko 3.4 (#11218) --- stubs/paramiko/METADATA.toml | 2 +- stubs/paramiko/paramiko/ssh_exception.pyi | 2 ++ stubs/paramiko/paramiko/transport.pyi | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/stubs/paramiko/METADATA.toml b/stubs/paramiko/METADATA.toml index 5c20bdcce..e25a1dea6 100644 --- a/stubs/paramiko/METADATA.toml +++ b/stubs/paramiko/METADATA.toml @@ -1,4 +1,4 @@ -version = "3.3.*" +version = "3.4.*" upstream_repository = "https://github.com/paramiko/paramiko" # Requires a version of cryptography where cryptography.hazmat.primitives.ciphers.Cipher is generic requires = ["cryptography>=37.0.0"] diff --git a/stubs/paramiko/paramiko/ssh_exception.pyi b/stubs/paramiko/paramiko/ssh_exception.pyi index 9f617e0e3..bdf34ff1f 100644 --- a/stubs/paramiko/paramiko/ssh_exception.pyi +++ b/stubs/paramiko/paramiko/ssh_exception.pyi @@ -32,6 +32,8 @@ class ProxyCommandFailure(SSHException): error: str def __init__(self, command: str, error: str) -> None: ... +class MessageOrderError(SSHException): ... + class NoValidConnectionsError(socket.error): errors: Mapping[tuple[str, int] | tuple[str, int, int, int], Exception] def __init__(self, errors: Mapping[tuple[str, int] | tuple[str, int, int, int], Exception]) -> None: ... diff --git a/stubs/paramiko/paramiko/transport.pyi b/stubs/paramiko/paramiko/transport.pyi index fba9a6cde..25e68fdfc 100644 --- a/stubs/paramiko/paramiko/transport.pyi +++ b/stubs/paramiko/paramiko/transport.pyi @@ -26,6 +26,9 @@ class _KexEngine(Protocol): class Transport(Thread, ClosingContextManager): active: bool hostname: str | None + server_extensions: dict[str, bytes] + advertise_strict_kex: bool + agreed_on_strict_kex: bool sock: socket | Channel packetizer: Packetizer local_version: str @@ -81,6 +84,8 @@ class Transport(Thread, ClosingContextManager): gss_deleg_creds: bool = True, disabled_algorithms: Mapping[str, Iterable[str]] | None = None, server_sig_algs: bool = True, + strict_kex: bool = True, + packetizer_class: type[Packetizer] | None = None, ) -> None: ... @property def preferred_ciphers(self) -> Sequence[str]: ...