urllib3/requests issues

docker/ssladapter/ssladapter.py

@@ -5,11 +5,11 @@
 from distutils.version import StrictVersion
 from requests.adapters import HTTPAdapter
 import ssl
-try:
-    import urllib3
-except ImportError:
-    import requests.packages.urllib3 as urllib3
 
+try:
+    import requests.packages.urllib3 as urllib3
+except ImportError:
+    import urllib3
 
 PoolManager = urllib3.poolmanager.PoolManager
 

docker/unixconn/unixconn.py

@@ -21,9 +21,9 @@ import requests.adapters
 import socket
 
 try:
-    import urllib3
-except ImportError:
     import requests.packages.urllib3 as urllib3
+except ImportError:
+    import urllib3
 
 
 class UnixHTTPConnection(httplib.HTTPConnection, object):
@@ -77,9 +77,9 @@ class UnixAdapter(requests.adapters.HTTPAdapter):
             if pool:
                 return pool
 
-            pool = UnixHTTPConnectionPool(self.base_url,
+            pool = UnixHTTPConnectionPool(
-                                          socket_path,
+                self.base_url, socket_path, self.timeout
-                                          self.timeout)
+            )
             self.pools[socket_path] = pool
 
         return pool

setup.py

@@ -7,7 +7,7 @@ ROOT_DIR = os.path.dirname(__file__)
 SOURCE_DIR = os.path.join(ROOT_DIR)
 
 requirements = [
-    'requests >= 2.2.1',
+    'requests >= 2.2.1, < 2.5.0',
     'six >= 1.3.0',
 ]