summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Sanderson <scoutoss@gmail.com>2015-02-24 11:23:00 -0500
committerScott Sanderson <scoutoss@gmail.com>2015-02-24 11:23:00 -0500
commitbf97ebb2edfce57580c70680eef098be380352ad (patch)
treeeec04b96206c112b8a555f7fef09b7b68e82e07d
parent5ce02b9f141c2ebe524946f2daeb518b86ce2efc (diff)
downloaddocker-py-bf97ebb2edfce57580c70680eef098be380352ad.tar.gz
BUG: Fix errors in Python 3 from JSON-decoding bytes.
-rw-r--r--docker/client.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/client.py b/docker/client.py
index 26adf28..6698d25 100644
--- 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