Kaydet (Commit) 45396446 authored tarafından Joffrey F's avatar Joffrey F

Move ssladapter to transport module

Signed-off-by: 's avatarJoffrey F <joffrey@docker.com>
üst 01c33c0f
......@@ -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
......
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,
......
# flake8: noqa
from .unixconn import UnixAdapter
from .ssladapter import SSLAdapter
try:
from .npipeconn import NpipeAdapter
from .npipesocket import NpipeSocket
......
import unittest
from docker import ssladapter
from docker.transport import ssladapter
try:
from backports.ssl_match_hostname import (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment