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

Fix some urllib3 import issues

This commit is contained in:
Joffrey F 2014-07-09 17:59:47 +02:00
parent d528e7ea51
commit 6f557ed733
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker/ssladapter/ssladapter.py
View File

@ -5,10 +5,12 @@
from distutils.version import StrictVersion
from requests.adapters import HTTPAdapter
try:
from requests.packages.urllib3.poolmanager import PoolManager
import requests.packages.urllib3 as urllib3
except ImportError:
import urllib3
from urllib3.poolmanager import PoolManager
PoolManager = urllib3.poolmanager.PoolManager
class SSLAdapter(HTTPAdapter):
@ -18,8 +20,9 @@ class SSLAdapter(HTTPAdapter):
super(SSLAdapter, self).__init__(**kwargs)
def init_poolmanager(self, connections, maxsize, block=False):
urllib_ver = urllib3.__version__
if urllib3 and StrictVersion(urllib_ver) <= StrictVersion('1.5'):
urllib_ver = urllib3.__version__.split('-')[0]
if urllib3 and urllib_ver != 'dev' and \
StrictVersion(urllib_ver) <= StrictVersion('1.5'):
self.poolmanager = PoolManager(num_pools=connections,
maxsize=maxsize,
block=block)