Skip to content

Commit 7e600a3

Browse files
committed
Merge branch 'py3-json' of https://github.com/ssanderson/docker-py into ssanderson-py3-json
2 parents a341aa2 + bf97ebb commit 7e600a3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

docker/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def _stream_helper(self, response, decode=False):
169169
if reader._fp.chunk_left:
170170
data += reader.read(reader._fp.chunk_left)
171171
if decode:
172-
data = json.loads(data)
172+
data = json.loads(data.decode('utf-8'))
173173
yield data
174174
else:
175175
# Response isn't chunked, meaning we probably

0 commit comments

Comments
 (0)