diff options
| author | Joffrey F <joffrey@docker.com> | 2016-12-01 18:00:15 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2016-12-01 18:04:40 -0800 |
| commit | 453964466741a1c85fc420c8b40fb5710f40b017 (patch) | |
| tree | 158c06ed9627a0404dde4686a348134bca282d13 | |
| parent | 01c33c0f684868290249945f9db9e00d7f03ecd9 (diff) | |
| download | docker-py-ssladapter_transport_module.tar.gz | |
Move ssladapter to transport modulessladapter_transport_module
Signed-off-by: Joffrey F <joffrey@docker.com>
| -rw-r--r-- | docker/api/client.py | 8 | ||||
| -rw-r--r-- | docker/tls.py | 5 | ||||
| -rw-r--r-- | docker/transport/__init__.py | 1 | ||||
| -rw-r--r-- | docker/transport/ssladapter.py (renamed from docker/ssladapter.py) | 0 | ||||
| -rw-r--r-- | tests/unit/ssladapter_test.py | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/docker/api/client.py b/docker/api/client.py index 23e239c..0b4d161 100644 --- a/docker/api/client.py +++ b/docker/api/client.py @@ -17,7 +17,7 @@ from .network import NetworkApiMixin from .service import ServiceApiMixin from .swarm import SwarmApiMixin from .volume import VolumeApiMixin -from .. import auth, ssladapter +from .. import auth from ..constants import (DEFAULT_TIMEOUT_SECONDS, DEFAULT_USER_AGENT, IS_WINDOWS_PLATFORM, DEFAULT_DOCKER_API_VERSION, STREAM_HEADER_SIZE_BYTES, DEFAULT_NUM_POOLS, @@ -25,7 +25,7 @@ from ..constants import (DEFAULT_TIMEOUT_SECONDS, DEFAULT_USER_AGENT, from ..errors import (DockerException, TLSParameterError, create_api_error_from_http_exception) from ..tls import TLSConfig -from ..transport import UnixAdapter +from ..transport import SSLAdapter, UnixAdapter from ..utils import utils, check_resource, update_headers from ..utils.socket import frames_iter try: @@ -121,9 +121,7 @@ class APIClient( if isinstance(tls, TLSConfig): tls.configure_client(self) elif tls: - self._custom_adapter = ssladapter.SSLAdapter( - pool_connections=num_pools - ) + self._custom_adapter = SSLAdapter(pool_connections=num_pools) self.mount('https://', self._custom_adapter) self.base_url = base_url diff --git a/docker/tls.py b/docker/tls.py index 3a0827a..6488bbc 100644 --- a/docker/tls.py +++ b/docker/tls.py @@ -1,7 +1,8 @@ import os import ssl -from . import errors, ssladapter +from . import errors +from .transport import SSLAdapter class TLSConfig(object): @@ -84,7 +85,7 @@ class TLSConfig(object): if self.cert: client.cert = self.cert - client.mount('https://', ssladapter.SSLAdapter( + client.mount('https://', SSLAdapter( ssl_version=self.ssl_version, assert_hostname=self.assert_hostname, assert_fingerprint=self.assert_fingerprint, diff --git a/docker/transport/__init__.py b/docker/transport/__init__.py index d5560b6..abbee18 100644 --- a/docker/transport/__init__.py +++ b/docker/transport/__init__.py @@ -1,5 +1,6 @@ # flake8: noqa from .unixconn import UnixAdapter +from .ssladapter import SSLAdapter try: from .npipeconn import NpipeAdapter from .npipesocket import NpipeSocket diff --git a/docker/ssladapter.py b/docker/transport/ssladapter.py index 31f45fc..31f45fc 100644 --- a/docker/ssladapter.py +++ b/docker/transport/ssladapter.py diff --git a/tests/unit/ssladapter_test.py b/tests/unit/ssladapter_test.py index 90d4c32..2b7ce52 100644 --- a/tests/unit/ssladapter_test.py +++ b/tests/unit/ssladapter_test.py @@ -1,5 +1,5 @@ import unittest -from docker import ssladapter +from docker.transport import ssladapter try: from backports.ssl_match_hostname import ( |