Python 3 fixes

2014-03-11 19:24:49 +02:00 · 2014-03-11 19:24:49 +02:00 · af84a2de72
parent 375521d7e2
commit af84a2de72
1 changed files with 8 additions and 2 deletions
--- a/docker/client.py
+++ b/docker/client.py
@ -228,6 +228,9 @@ class Client(requests.Session):

    def _get_raw_response_socket(self, response):
        self._raise_for_status(response)
+        if six.PY3:
+            return response.raw._fp.fp.raw._sock
+        else:
            return response.raw._fp.fp._sock

    def _stream_helper(self, response):
@ -264,6 +267,9 @@ class Client(requests.Session):
        socket = self._get_raw_response_socket(response)

        def recvall(socket, size):
+            if six.PY3:
+                data = bytes()
+            else:
                data = ''
            while size > 0:
                block = socket.recv(size)