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

Merge pull request #262 from li4li5li6/fix_ssl_version

fix ssl_version exception when urllib3 version <= 1.5
...@@ -2,10 +2,12 @@ ...@@ -2,10 +2,12 @@
https://lukasa.co.uk/2013/01/Choosing_SSL_Version_In_Requests/ https://lukasa.co.uk/2013/01/Choosing_SSL_Version_In_Requests/
https://github.com/kennethreitz/requests/pull/799 https://github.com/kennethreitz/requests/pull/799
""" """
from distutils.version import StrictVersion
from requests.adapters import HTTPAdapter from requests.adapters import HTTPAdapter
try: try:
from requests.packages.urllib3.poolmanager import PoolManager from requests.packages.urllib3.poolmanager import PoolManager
except ImportError: except ImportError:
import urllib3
from urllib3.poolmanager import PoolManager from urllib3.poolmanager import PoolManager
...@@ -16,6 +18,12 @@ class SSLAdapter(HTTPAdapter): ...@@ -16,6 +18,12 @@ class SSLAdapter(HTTPAdapter):
super(SSLAdapter, self).__init__(**kwargs) super(SSLAdapter, self).__init__(**kwargs)
def init_poolmanager(self, connections, maxsize, block=False): def init_poolmanager(self, connections, maxsize, block=False):
urllib_ver = urllib3.__version__
if urllib3 and StrictVersion(urllib_ver) <= StrictVersion('1.5'):
self.poolmanager = PoolManager(num_pools=connections,
maxsize=maxsize,
block=block)
else:
self.poolmanager = PoolManager(num_pools=connections, self.poolmanager = PoolManager(num_pools=connections,
maxsize=maxsize, maxsize=maxsize,
block=block, block=block,
......
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