Fix non-stream logs for python3

docker · Jun 20, 2014 · 3ad75e0 · 3ad75e0
1 parent 8a63e70
commit 3ad75e0
Showing 1 changed file with 10 additions and 2 deletions.
diff --git 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,