From 6b7a828400f46ea81374bc5764d8aa81bf38f6f7 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Mon, 19 Sep 2016 18:03:01 -0700 Subject: Raise DockerException when encountering non-JSON chunk in stream_helper Signed-off-by: Joffrey F --- docker/client.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'docker/client.py') diff --git a/docker/client.py b/docker/client.py index 47ad09e..c013849 100644 --- a/docker/client.py +++ b/docker/client.py @@ -256,7 +256,12 @@ class Client( data_list = data.split("\r\n") # load and yield each line seperately for data in data_list: - data = json.loads(data) + try: + data = json.loads(data) + except Exception: + raise errors.DockerException( + '"{0}" is not valid JSON.' + ) yield data else: yield data -- cgit v1.2.1