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

2015-03-04 13:35:35 -08:00 · 2015-03-04 13:35:35 -08:00 · 7e600a3fe7
parent a341aa2d26 bf97ebb2ed
commit 7e600a3fe7
1 changed files with 1 additions and 1 deletions
--- a/docker/client.py
+++ b/docker/client.py
@ -169,7 +169,7 @@ class Client(requests.Session):
                if reader._fp.chunk_left:
                    data += reader.read(reader._fp.chunk_left)
                if decode:
-                    data = json.loads(data)
+                    data = json.loads(data.decode('utf-8'))
                yield data
        else:
            # Response isn't chunked, meaning we probably