From 1818712b8c16c3eaefef41a5e35bc049cc6fbf4f Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Wed, 3 Jan 2024 21:38:53 +0200 Subject: [PATCH] Untangle circular imports Signed-off-by: Aarni Koskela --- docker/context/api.py | 5 +++-- docker/context/context.py | 7 ++++--- docker/transport/npipeconn.py | 3 +-- docker/transport/sshconn.py | 3 +-- docker/transport/unixconn.py | 3 +-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/docker/context/api.py b/docker/context/api.py index ae5d67bb2..9ac4ff470 100644 --- a/docker/context/api.py +++ b/docker/context/api.py @@ -2,13 +2,14 @@ import os from docker import errors -from docker.context import Context -from docker.context.config import ( + +from .config import ( METAFILE, get_current_context_name, get_meta_dir, write_context_name_to_docker_config, ) +from .context import Context class ContextAPI: diff --git a/docker/context/context.py b/docker/context/context.py index 317bcf61d..da17d9478 100644 --- a/docker/context/context.py +++ b/docker/context/context.py @@ -2,14 +2,15 @@ import os from shutil import copyfile, rmtree -from docker.context.config import ( +from docker.errors import ContextException +from docker.tls import TLSConfig + +from .config import ( get_context_host, get_meta_dir, get_meta_file, get_tls_dir, ) -from docker.errors import ContextException -from docker.tls import TLSConfig class Context: diff --git a/docker/transport/npipeconn.py b/docker/transport/npipeconn.py index fe740a5f8..44d6921c2 100644 --- a/docker/transport/npipeconn.py +++ b/docker/transport/npipeconn.py @@ -4,9 +4,8 @@ import urllib3 import urllib3.connection -from docker.transport.basehttpadapter import BaseHTTPAdapter - from .. import constants +from .basehttpadapter import BaseHTTPAdapter from .npipesocket import NpipeSocket RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer diff --git a/docker/transport/sshconn.py b/docker/transport/sshconn.py index 91671e920..187066801 100644 --- a/docker/transport/sshconn.py +++ b/docker/transport/sshconn.py @@ -11,9 +11,8 @@ import urllib3 import urllib3.connection -from docker.transport.basehttpadapter import BaseHTTPAdapter - from .. import constants +from .basehttpadapter import BaseHTTPAdapter RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer diff --git a/docker/transport/unixconn.py b/docker/transport/unixconn.py index f88d29ebf..d571833f0 100644 --- a/docker/transport/unixconn.py +++ b/docker/transport/unixconn.py @@ -4,9 +4,8 @@ import urllib3 import urllib3.connection -from docker.transport.basehttpadapter import BaseHTTPAdapter - from .. import constants +from .basehttpadapter import BaseHTTPAdapter RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer