Merge pull request #1802 from docker/2.6.1-release

2.6.1 release

Author: shin-

docker/transport/unixconn.py

@@ -21,13 +21,12 @@
 class UnixHTTPResponse(httplib.HTTPResponse, object):
     def __init__(self, sock, *args, **kwargs):
         disable_buffering = kwargs.pop('disable_buffering', False)
+        if six.PY2:
+            # FIXME: We may need to disable buffering on Py3 as well,
+            # but there's no clear way to do it at the moment. See:
+            # https://github.com/docker/docker-py/issues/1799
+            kwargs['buffering'] = not disable_buffering
         super(UnixHTTPResponse, self).__init__(sock, *args, **kwargs)
-        if disable_buffering is True:
-            # We must first create a new pointer then close the old one
-            # to avoid closing the underlying socket.
-            new_fp = sock.makefile('rb', 0)
-            self.fp.close()
-            self.fp = new_fp
 
 
 class UnixHTTPConnection(httplib.HTTPConnection, object):

docker/version.py

@@ -1,2 +1,2 @@
-version = "2.6.0"
+version = "2.6.1"
 version_info = tuple([int(d) for d in version.split("-")[0].split(".")])

docs/change-log.md

@@ -1,10 +1,21 @@
 Change log
 ==========
 
+2.6.1
+-----
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/40?closed=1)
+
+### Bugfixes
+
+* Fixed a bug on Python 3 installations preventing the use of the `attach` and
+  `exec_run` methods.
+
+
 2.6.0
 -----
 
-[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/34?closed=1)
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/38?closed=1)
 
 ### Features