npipe support cleanup

Signed-off-by: Joffrey F <[email protected]>

Author: shin-

docker/client.py

@@ -26,14 +26,14 @@
 from . import constants
 from . import errors
 from .auth import auth
-from .unixconn import unixconn
+from .ssladapter import ssladapter
+from .tls import TLSConfig
+from .transport import UnixAdapter
+from .utils import utils, check_resource, update_headers, kwargs_from_env
 try:
-    from .npipeconn import npipeconn
+    from .transport import NpipeAdapter
 except ImportError:
     pass
-from .ssladapter import ssladapter
-from .utils import utils, check_resource, update_headers, kwargs_from_env
-from .tls import TLSConfig
 
 
 def from_env(**kwargs):
@@ -65,15 +65,20 @@ def __init__(self, base_url=None, version=None,
 
         base_url = utils.parse_host(base_url, sys.platform, tls=bool(tls))
         if base_url.startswith('http+unix://'):
-            self._custom_adapter = unixconn.UnixAdapter(base_url, timeout)
+            self._custom_adapter = UnixAdapter(base_url, timeout)
             self.mount('http+docker://', self._custom_adapter)
             self.base_url = 'http+docker://localunixsocket'
         elif base_url.startswith('npipe://'):
             if not constants.IS_WINDOWS_PLATFORM:
                 raise errors.DockerException(
                     'The npipe:// protocol is only supported on Windows'
                 )
-            self._custom_adapter = npipeconn.NpipeAdapter(base_url, timeout)
+            try:
+                self._custom_adapter = NpipeAdapter(base_url, timeout)
+            except NameError:
+                raise errors.DockerException(
+                    'Install pypiwin32 package to enable npipe:// support'
+                )
             self.mount('http+docker://', self._custom_adapter)
             self.base_url = 'http+docker://localnpipe'
         else:

docker/npipeconn/test_npipe_echoserv.py

@@ -0,0 +1,3 @@
+# flake8: noqa
+from .npipe import NpipeAdapter
+from .unixconn import UnixAdapter

docker/transport/__init__.py

@@ -35,7 +35,7 @@
     description="Python client for Docker.",
     url='https://github.com/docker/docker-py/',
     packages=[
-        'docker', 'docker.api', 'docker.auth', 'docker.unixconn',
+        'docker', 'docker.api', 'docker.auth', 'docker.transport',
         'docker.utils', 'docker.utils.ports', 'docker.ssladapter'
     ],
     install_requires=requirements,