Untangle circular imports

Author: akx

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:

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:

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

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
 

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