From f37f025b17f8c991127b05e753e5ca5941619266 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 20 Mar 2026 12:53:07 +0100 Subject: [PATCH] lib.SSHClient: Move to lib.ec SSHClient in an ExecContext, hence it's better off in lib.ec, move it there and adapt the references. Signed-off-by: Jan Lindemann --- src/python/jw/pkg/cmds/projects/CmdListRepos.py | 2 +- src/python/jw/pkg/lib/ExecContext.py | 2 +- src/python/jw/pkg/lib/{ => ec}/SSHClient.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/python/jw/pkg/lib/{ => ec}/SSHClient.py (98%) diff --git a/src/python/jw/pkg/cmds/projects/CmdListRepos.py b/src/python/jw/pkg/cmds/projects/CmdListRepos.py index 79356ca5..c82b024a 100644 --- a/src/python/jw/pkg/cmds/projects/CmdListRepos.py +++ b/src/python/jw/pkg/cmds/projects/CmdListRepos.py @@ -32,7 +32,7 @@ class CmdListRepos(Cmd): # export match url.scheme: case 'ssh': if re.match(r'ssh://.*git\.janware\.com/', args.base_url): - from jw.pkg.lib.SSHClient import ssh_client + from jw.pkg.lib.ec.SSHClient import ssh_client ssh = ssh_client(args.base_url) if username is not None: ssh.set_username(username) diff --git a/src/python/jw/pkg/lib/ExecContext.py b/src/python/jw/pkg/lib/ExecContext.py index 0150e03f..af3035cc 100644 --- a/src/python/jw/pkg/lib/ExecContext.py +++ b/src/python/jw/pkg/lib/ExecContext.py @@ -234,7 +234,7 @@ class ExecContext(abc.ABC): from .ec.Local import Local return Local(uri, *args, **kwargs) case 'ssh': - from .SSHClient import ssh_client + from .ec.SSHClient import ssh_client return ssh_client(uri, *args, **kwargs) case _: pass diff --git a/src/python/jw/pkg/lib/SSHClient.py b/src/python/jw/pkg/lib/ec/SSHClient.py similarity index 98% rename from src/python/jw/pkg/lib/SSHClient.py rename to src/python/jw/pkg/lib/ec/SSHClient.py index 981d0962..72e02de5 100644 --- a/src/python/jw/pkg/lib/SSHClient.py +++ b/src/python/jw/pkg/lib/ec/SSHClient.py @@ -4,9 +4,9 @@ from typing import Any import os, abc, shlex, sys -from .util import run_cmd, pretty_cmd -from .log import * -from .ExecContext import ExecContext, Result +from ..util import run_cmd, pretty_cmd +from ..log import * +from ..ExecContext import ExecContext, Result from urllib.parse import urlparse class SSHClient(ExecContext):