Skip to content

Commit 336e65f

Browse files
authored
Merge pull request #3212 from valohai/ruff-i
2 parents 4c6437d + 1818712 commit 336e65f

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

docker/context/api.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
import os
33

44
from docker import errors
5-
from docker.context import Context
6-
from docker.context.config import (
5+
6+
from .config import (
77
METAFILE,
88
get_current_context_name,
99
get_meta_dir,
1010
write_context_name_to_docker_config,
1111
)
12+
from .context import Context
1213

1314

1415
class ContextAPI:

docker/context/context.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
import os
33
from shutil import copyfile, rmtree
44

5-
from docker.context.config import (
5+
from docker.errors import ContextException
6+
from docker.tls import TLSConfig
7+
8+
from .config import (
69
get_context_host,
710
get_meta_dir,
811
get_meta_file,
912
get_tls_dir,
1013
)
11-
from docker.errors import ContextException
12-
from docker.tls import TLSConfig
1314

1415

1516
class Context:

docker/transport/npipeconn.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
import urllib3
55
import urllib3.connection
66

7-
from docker.transport.basehttpadapter import BaseHTTPAdapter
8-
97
from .. import constants
8+
from .basehttpadapter import BaseHTTPAdapter
109
from .npipesocket import NpipeSocket
1110

1211
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer

docker/transport/sshconn.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
import urllib3
1212
import urllib3.connection
1313

14-
from docker.transport.basehttpadapter import BaseHTTPAdapter
15-
1614
from .. import constants
15+
from .basehttpadapter import BaseHTTPAdapter
1716

1817
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
1918

docker/transport/unixconn.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
import urllib3
55
import urllib3.connection
66

7-
from docker.transport.basehttpadapter import BaseHTTPAdapter
8-
97
from .. import constants
8+
from .basehttpadapter import BaseHTTPAdapter
109

1110
RecentlyUsedContainer = urllib3._collections.RecentlyUsedContainer
1211

0 commit comments

Comments
 (0)