Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reorganize asyncssh imports #101

Merged
merged 1 commit into from
Feb 5, 2025
Merged

reorganize asyncssh imports #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions dvc_ssh/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,24 @@
from getpass import getpass
from typing import TYPE_CHECKING, Optional, cast

from asyncssh import SSHClient
from asyncssh.public_key import (
_DEFAULT_KEY_FILES,
from asyncssh import (
KeyEncryptionError,
KeyImportError,
SSHLocalKeyPair,
SSHClient,
read_private_key,
read_public_key,
)
from asyncssh.public_key import _DEFAULT_KEY_FILES, SSHLocalKeyPair

if TYPE_CHECKING:
from asyncssh import SSHClientConnection, SSHKey
from asyncssh.auth import KbdIntPrompts, KbdIntResponse
from asyncssh.config import FilePath
from asyncssh.connection import SSHClientConnection
from asyncssh.misc import MaybeAwait
from asyncssh.public_key import KeyPairListArg, SSHKey
from asyncssh.misc import FilePath
from asyncssh.public_key import KeyPairListArg


class InteractiveSSHClient(SSHClient):
def __init__(self, *args, **kwargs):
def __init__(self, *args, **kwargs) -> None:
super().__init__(*args, **kwargs)
self._conn: Optional[SSHClientConnection] = None
self._keys_to_try: Optional[list[FilePath]] = None
Expand Down Expand Up @@ -95,7 +93,7 @@ async def _read_private_key_interactive(self, path: "FilePath") -> "SSHKey":
pass
raise KeyImportError("Incorrect passphrase")

def kbdint_auth_requested(self) -> "MaybeAwait[Optional[str]]":
def kbdint_auth_requested(self) -> str:
return ""

async def kbdint_challenge_received(
Expand Down
Loading