Skip to content

Commit a043173

Browse files
committed
Merge branch 'ssanderson-py3-json'
2 parents a341aa2 + dc210b8 commit a043173

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

docker/client.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ 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+
if six.PY3:
173+
data = data.decode('utf-8')
172174
data = json.loads(data)
173175
yield data
174176
else:

0 commit comments

Comments
 (0)