docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45 from dotcloud/43-urllib3-dep 

If requests.packages.urllib3 isn't present try to import urllib3 directly
This commit is contained in:
Joffrey F 2013-09-23 08:53:19 -07:00
parent 1c161a4ab1 53af7e8140
commit b01c1bf1fc
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/unixconn.py
View File

@ -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