From 53af7e8140bf6cb05e117c94b2f6ff3b203c04bd Mon Sep 17 00:00:00 2001 From: shin- Date: Fri, 20 Sep 2013 16:54:30 +0200 Subject: [PATCH] If requests.pqckqges.urllib3 isn't present try to import urllib3 directly --- docker/unixconn.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docker/unixconn.py b/docker/unixconn.py index ff71ea6b..561230c5 100644 --- a/docker/unixconn.py +++ b/docker/unixconn.py @@ -14,10 +14,12 @@ import httplib import requests.adapters -import requests.packages.urllib3.connectionpool import socket -HTTPConnectionPool = requests.packages.urllib3.connectionpool.HTTPConnectionPool +try: + import requests.packages.urllib3.connectionpool as connectionpool +except ImportError: + import urllib3.connectionpool as connectionpool class UnixHTTPConnection(httplib.HTTPConnection, object): @@ -28,7 +30,7 @@ class UnixHTTPConnection(httplib.HTTPConnection, object): def connect(self): sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - sock.connect(self.base_url.replace("unix:/","")) + sock.connect(self.base_url.replace("unix:/", "")) self.sock = sock def _extract_path(self, url): @@ -40,7 +42,7 @@ class UnixHTTPConnection(httplib.HTTPConnection, object): super(UnixHTTPConnection, self).request(method, url, **kwargs) -class UnixHTTPConnectionPool(HTTPConnectionPool): +class UnixHTTPConnectionPool(connectionpool.HTTPConnectionPool): def __init__(self, base_url, socket_path): self.socket_path = socket_path self.base_url = base_url