Make docker.ssladaptor a single file

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
This commit is contained in:
Ben Firshman 2016-09-15 14:26:33 +01:00
parent 2c9d1110f0
commit 19eefcf705
No known key found for this signature in database
GPG Key ID: 18296449E36D2F1E
6 changed files with 4 additions and 7 deletions

View File

@ -9,8 +9,7 @@ import six
import websocket import websocket
from . import api, auth, constants, errors from . import api, auth, constants, errors, ssladapter
from .ssladapter import ssladapter
from .tls import TLSConfig from .tls import TLSConfig
from .transport import UnixAdapter from .transport import UnixAdapter
from .utils import utils, check_resource, update_headers, kwargs_from_env from .utils import utils, check_resource, update_headers, kwargs_from_env

View File

@ -1 +0,0 @@
from .ssladapter import SSLAdapter # flake8: noqa

View File

@ -1,8 +1,7 @@
import os import os
import ssl import ssl
from . import errors from . import errors, ssladapter
from .ssladapter import ssladapter
class TLSConfig(object): class TLSConfig(object):

View File

@ -50,7 +50,7 @@ setup(
url='https://github.com/docker/docker-py/', url='https://github.com/docker/docker-py/',
packages=[ packages=[
'docker', 'docker.api', 'docker.transport', 'docker.utils', 'docker', 'docker.api', 'docker.transport', 'docker.utils',
'docker.utils.ports', 'docker.ssladapter', 'docker.types', 'docker.utils.ports', 'docker.types',
], ],
install_requires=requirements, install_requires=requirements,
tests_require=test_requirements, tests_require=test_requirements,

View File

@ -1,4 +1,4 @@
from docker.ssladapter import ssladapter from docker import ssladapter
try: try:
from backports.ssl_match_hostname import ( from backports.ssl_match_hostname import (