From 3ad75e0896ace0c6d6736fe5ac920b1a63aaeb4c Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Fri, 20 Jun 2014 21:08:44 +0200 Subject: [PATCH] Fix non-stream logs for python3 --- docker/client.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docker/client.py b/docker/client.py index 5c0836cbe..6341c4165 100644 --- a/docker/client.py +++ b/docker/client.py @@ -624,8 +624,16 @@ def logs(self, container, stdout=True, stderr=True, stream=False, 'follow': stream and 1 or 0} url = self._url("/containers/{0}/logs".format(container)) res = self._get(url, params=params, stream=stream) - return stream and self._multiplexed_socket_stream_helper(res) or \ - ''.join([x for x in self._multiplexed_buffer_helper(res)]) + if stream: + return self._multiplexed_socket_stream_helper(res) + elif six.PY3: + return bytes().join( + [x for x in self._multiplexed_buffer_helper(res)] + ) + else: + return str().join( + [x for x in self._multiplexed_buffer_helper(res)] + ) return self.attach( container, stdout=stdout,