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

Python 3 fixes

This commit is contained in:
Karl-Aksel Puulmann 2014-03-11 19:24:49 +02:00
parent 375521d7e2
commit af84a2de72
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/client.py
View File

@ -228,7 +228,10 @@ class Client(requests.Session):
def _get_raw_response_socket(self, response):
self._raise_for_status(response)
return response.raw._fp.fp._sock
if six.PY3:
return response.raw._fp.fp.raw._sock
else:
return response.raw._fp.fp._sock
def _stream_helper(self, response):
"""Generator for data coming from a chunked-encoded HTTP response."""
@ -264,7 +267,10 @@ class Client(requests.Session):
socket = self._get_raw_response_socket(response)
def recvall(socket, size):
data = ''
if six.PY3:
data = bytes()
else:
data = ''
while size > 0:
block = socket.recv(size)
if not block: