mirror of https://github.com/docker/docker-py.git
Untangle circular imports
Signed-off-by: Aarni Koskela <akx@iki.fi>
This commit is contained in:
parent
d50cc429c2
commit
1818712b8c
|
@ -2,13 +2,14 @@ import json
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from docker import errors
|
from docker import errors
|
||||||
from docker.context import Context
|
|
||||||
from docker.context.config import (
|
from .config import (
|
||||||
METAFILE,
|
METAFILE,
|
||||||
get_current_context_name,
|
get_current_context_name,
|
||||||
get_meta_dir,
|
get_meta_dir,
|
||||||
write_context_name_to_docker_config,
|
write_context_name_to_docker_config,
|
||||||
)
|
)
|
||||||
|
from .context import Context
|
||||||
|
|
||||||
|
|
||||||
class ContextAPI:
|
class ContextAPI:
|
||||||
|
|
|
@ -2,14 +2,15 @@ import json
|
||||||
import os
|
import os
|
||||||
from shutil import copyfile, rmtree
|
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_context_host,
|
||||||
get_meta_dir,
|
get_meta_dir,
|
||||||
get_meta_file,
|
get_meta_file,
|
||||||
get_tls_dir,
|
get_tls_dir,
|
||||||
)
|
)
|
||||||
from docker.errors import ContextException
|
|
||||||
from docker.tls import TLSConfig
|
|
||||||
|
|
||||||
|
|
||||||
class Context:
|
class Context:
|
||||||
|
|
|
@ -4,9 +4,8 @@ import requests.adapters
|
||||||
import urllib3
|
import urllib3
|
||||||
import urllib3.connection
|
import urllib3.connection
|
||||||
|
|
||||||
from docker.transport.basehttpadapter import BaseHTTPAdapter
|
|
||||||
|
|
||||||
from .. import constants
|
from .. import constants
|
||||||
|
from .basehttpadapter import BaseHTTPAdapter
|
||||||
from .npipesocket import NpipeSocket
|
from .npipesocket import NpipeSocket
|
||||||
|
|
||||||
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
|
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
|
||||||
|
|
|
@ -11,9 +11,8 @@ import requests.adapters
|
||||||
import urllib3
|
import urllib3
|
||||||
import urllib3.connection
|
import urllib3.connection
|
||||||
|
|
||||||
from docker.transport.basehttpadapter import BaseHTTPAdapter
|
|
||||||
|
|
||||||
from .. import constants
|
from .. import constants
|
||||||
|
from .basehttpadapter import BaseHTTPAdapter
|
||||||
|
|
||||||
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
|
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,8 @@ import requests.adapters
|
||||||
import urllib3
|
import urllib3
|
||||||
import urllib3.connection
|
import urllib3.connection
|
||||||
|
|
||||||
from docker.transport.basehttpadapter import BaseHTTPAdapter
|
|
||||||
|
|
||||||
from .. import constants
|
from .. import constants
|
||||||
|
from .basehttpadapter import BaseHTTPAdapter
|
||||||
|
|
||||||
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
|
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue