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

Merge branch 'py3-json' of https://github.com/ssanderson/docker-py into ssanderson-py3-json

This commit is contained in:
Joffrey F 2015-03-04 13:35:35 -08:00
parent a341aa2d26 bf97ebb2ed
commit 7e600a3fe7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/client.py
View File

@ -169,7 +169,7 @@ class Client(requests.Session):
if reader._fp.chunk_left: if reader._fp.chunk_left:
data += reader.read(reader._fp.chunk_left) data += reader.read(reader._fp.chunk_left)
if decode: if decode:
data = json.loads(data) data = json.loads(data.decode('utf-8'))
yield data yield data
else: else:
# Response isn't chunked, meaning we probably # Response isn't chunked, meaning we probably