docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplified init_poolmanager

This commit is contained in:
Joffrey F 2014-09-08 17:22:49 +02:00
parent ff8c9bb5fd
commit d9f1b250fd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
docker/ssladapter/ssladapter.py
View File

@ -21,13 +21,13 @@ class SSLAdapter(HTTPAdapter):
def init_poolmanager(self, connections, maxsize, block=False): def init_poolmanager(self, connections, maxsize, block=False):
urllib_ver = urllib3.__version__.split('-')[0] urllib_ver = urllib3.__version__.split('-')[0]
if urllib3 and urllib_ver != 'dev' and \ kwargs = {
StrictVersion(urllib_ver) <= StrictVersion('1.5'): 'num_pools': connections,
self.poolmanager = PoolManager(num_pools=connections, 'maxsize': maxsize,
maxsize=maxsize, 'block': block
block=block) }
else: if urllib3 and urllib_ver == 'dev' and \
self.poolmanager = PoolManager(num_pools=connections, StrictVersion(urllib_ver) > StrictVersion('1.5'):
maxsize=maxsize, kwargs['ssl_version'] = self.ssl_version
block=block,
ssl_version=self.ssl_version) self.poolmanager = PoolManager(**kwargs)