Merge pull request #1081 from tescalada/master

1059-Fixing a bug with multiple json objects
2016-08-23 15:10:56 -07:00 · 2016-08-23 15:10:56 -07:00 · abd461150a
parent 0acdd19665 f8b843b127
commit abd461150a
1 changed files with 10 additions and 2 deletions
--- a/docker/client.py
+++ b/docker/client.py
@ -255,8 +255,16 @@ class Client(
                if decode:
                    if six.PY3:
                        data = data.decode('utf-8')
-                    data = json.loads(data)
-                yield data
+                    # remove the trailing newline
+                    data = data.strip()
+                    # split the data at any newlines
+                    data_list = data.split("\r\n")
+                    # load and yield each line seperately
+                    for data in data_list:
+                        data = json.loads(data)
+                        yield data
+                else:
+                    yield data
        else:
            # Response isn't chunked, meaning we probably
            # encountered an error immediately