From 97bd69162a9e6ec3f8c8a6a45b084c9818745c46 Mon Sep 17 00:00:00 2001
From: shin- <joffrey@dotcloud.com>
Date: Wed, 16 Oct 2013 17:30:57 +0200
Subject: [PATCH] Added support for unix:/// protocol (default for docker CLI)

---
 docker/client.py            | 2 ++
 docker/unixconn/unixconn.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker/client.py b/docker/client.py
index 3da7353b..80424655 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -60,6 +60,8 @@ class APIError(requests.exceptions.HTTPError):
 class Client(requests.Session):
     def __init__(self, base_url="unix://var/run/docker.sock", version="1.4"):
         super(Client, self).__init__()
+        if base_url.startswith('unix:///'):
+            base_url = base_url.replace('unix:/', 'unix:')
         self.mount('unix://', unixconn.UnixAdapter(base_url))
         self.base_url = base_url
         self._version = version
diff --git a/docker/unixconn/unixconn.py b/docker/unixconn/unixconn.py
index b6f3264e..08910998 100644
--- a/docker/unixconn/unixconn.py
+++ b/docker/unixconn/unixconn.py
@@ -14,7 +14,7 @@
 import six
 
 if six.PY3:
-    from http import client as httplib
+    import http.client as httplib
 else:
     import httplib
 import requests.adapters