summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2014-01-31 09:39:37 -0800
committerJoffrey F <f.joffrey@gmail.com>2014-01-31 09:39:37 -0800
commit789c22b9337766702e5a6fa6eb4225dc8556f008 (patch)
tree588751da2e12829d1a5ab12a149287557cb3cb2d
parentc00618d33698c2c0df770641e0dc1fd06b1c9819 (diff)
parentb97e6ea0436c3ab59d2a912627e77636a2b65a6f (diff)
downloaddocker-py-789c22b9337766702e5a6fa6eb4225dc8556f008.tar.gz
Merge pull request #155 from bfirsh/fix-concat-string-with-bytes
Fix _stream_result concatenating bytes with str
-rw-r--r--docker/client.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/client.py b/docker/client.py
index 7347e31..c81aa9e 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -225,7 +225,7 @@ class Client(requests.Session):
def _stream_result(self, response):
"""Generator for straight-out, non chunked-encoded HTTP responses."""
self._raise_for_status(response)
- for line in response.iter_lines(chunk_size=1):
+ for line in response.iter_lines(chunk_size=1, decode_unicode=True):
# filter out keep-alive new lines
if line:
yield line + '\n'