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

Fix some urllib3 import issues

üst d528e7ea
...@@ -5,10 +5,12 @@ ...@@ -5,10 +5,12 @@
from distutils.version import StrictVersion from distutils.version import StrictVersion
from requests.adapters import HTTPAdapter from requests.adapters import HTTPAdapter
try: try:
from requests.packages.urllib3.poolmanager import PoolManager import requests.packages.urllib3 as urllib3
except ImportError: except ImportError:
import urllib3 import urllib3
from urllib3.poolmanager import PoolManager
PoolManager = urllib3.poolmanager.PoolManager
class SSLAdapter(HTTPAdapter): class SSLAdapter(HTTPAdapter):
...@@ -18,8 +20,9 @@ class SSLAdapter(HTTPAdapter): ...@@ -18,8 +20,9 @@ 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__ urllib_ver = urllib3.__version__.split('-')[0]
if urllib3 and StrictVersion(urllib_ver) <= StrictVersion('1.5'): if urllib3 and urllib_ver != 'dev' and \
StrictVersion(urllib_ver) <= StrictVersion('1.5'):
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