From 9e295d666aa831eb32665bb7e748e3eab0f06a0c Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Fri, 9 Jan 2015 15:24:22 -0800 Subject: [PATCH] urllib3/requests issues --- docker/ssladapter/ssladapter.py | 8 ++++---- docker/unixconn/unixconn.py | 10 +++++----- setup.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/ssladapter/ssladapter.py b/docker/ssladapter/ssladapter.py index 06c3761b..9727d373 100644 --- a/docker/ssladapter/ssladapter.py +++ b/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 diff --git a/docker/unixconn/unixconn.py b/docker/unixconn/unixconn.py index 841778cc..1f18060a 100644 --- a/docker/unixconn/unixconn.py +++ b/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, - socket_path, - self.timeout) + pool = UnixHTTPConnectionPool( + self.base_url, socket_path, self.timeout + ) self.pools[socket_path] = pool return pool diff --git a/setup.py b/setup.py index b63cc92b..a0a1eba4 100644 --- a/setup.py +++ b/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', ]