Skip to content

Commit db454f0

Browse files
committed
Merge pull request #262 from li4li5li6/fix_ssl_version
fix ssl_version exception when urllib3 version <= 1.5
2 parents e688859 + af91c78 commit db454f0

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

docker/ssladapter/ssladapter.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
https://lukasa.co.uk/2013/01/Choosing_SSL_Version_In_Requests/
33
https://github.com/kennethreitz/requests/pull/799
44
"""
5+
from distutils.version import StrictVersion
56
from requests.adapters import HTTPAdapter
67
try:
78
from requests.packages.urllib3.poolmanager import PoolManager
89
except ImportError:
10+
import urllib3
911
from urllib3.poolmanager import PoolManager
1012

1113

@@ -16,7 +18,13 @@ def __init__(self, ssl_version=None, **kwargs):
1618
super(SSLAdapter, self).__init__(**kwargs)
1719

1820
def init_poolmanager(self, connections, maxsize, block=False):
19-
self.poolmanager = PoolManager(num_pools=connections,
20-
maxsize=maxsize,
21-
block=block,
22-
ssl_version=self.ssl_version)
21+
urllib_ver = urllib3.__version__
22+
if urllib3 and StrictVersion(urllib_ver) <= StrictVersion('1.5'):
23+
self.poolmanager = PoolManager(num_pools=connections,
24+
maxsize=maxsize,
25+
block=block)
26+
else:
27+
self.poolmanager = PoolManager(num_pools=connections,
28+
maxsize=maxsize,
29+
block=block,
30+
ssl_version=self.ssl_version)

0 commit comments

Comments
 (0)