diff --git a/docker/client.py b/docker/client.py index 19801e32..35f45327 100644 --- a/docker/client.py +++ b/docker/client.py @@ -9,8 +9,7 @@ import six import websocket -from . import api, auth, constants, errors -from .ssladapter import ssladapter +from . import api, auth, constants, errors, ssladapter from .tls import TLSConfig from .transport import UnixAdapter from .utils import utils, check_resource, update_headers, kwargs_from_env diff --git a/docker/ssladapter/ssladapter.py b/docker/ssladapter.py similarity index 100% rename from docker/ssladapter/ssladapter.py rename to docker/ssladapter.py diff --git a/docker/ssladapter/__init__.py b/docker/ssladapter/__init__.py deleted file mode 100644 index 31b8966b..00000000 --- a/docker/ssladapter/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from .ssladapter import SSLAdapter # flake8: noqa diff --git a/docker/tls.py b/docker/tls.py index 18c72598..7c3a2ca3 100644 --- a/docker/tls.py +++ b/docker/tls.py @@ -1,8 +1,7 @@ import os import ssl -from . import errors -from .ssladapter import ssladapter +from . import errors, ssladapter class TLSConfig(object): diff --git a/setup.py b/setup.py index ff80e3a8..120e05e0 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ setup( url='https://github.com/docker/docker-py/', packages=[ 'docker', 'docker.api', 'docker.transport', 'docker.utils', - 'docker.utils.ports', 'docker.ssladapter', 'docker.types', + 'docker.utils.ports', 'docker.types', ], install_requires=requirements, tests_require=test_requirements, diff --git a/tests/unit/ssladapter_test.py b/tests/unit/ssladapter_test.py index 8c905cf5..6af436bd 100644 --- a/tests/unit/ssladapter_test.py +++ b/tests/unit/ssladapter_test.py @@ -1,4 +1,4 @@ -from docker.ssladapter import ssladapter +from docker import ssladapter try: from backports.ssl_match_hostname import (