From 4153a38d6ca67489f5b42fdc4d6354d66db626ba Mon Sep 17 00:00:00 2001 From: Fabrice Bacchella Date: Thu, 30 Oct 2014 11:00:28 +0100 Subject: [PATCH 1/2] When docker is stopped, docker-py receive a empty string in socket.readline() --- docker/client.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker/client.py b/docker/client.py index c09b451a..476b1593 100644 --- a/docker/client.py +++ b/docker/client.py @@ -287,7 +287,11 @@ class Client(requests.Session): if size_line == '\r\n' or size_line == '\n': size_line = socket.readline() - size = int(size_line, 16) + if len(size_line.strip()) > 0: + size = int(size_line, 16) + else: + break + if size <= 0: break data = socket.readline() From 44b962c122a931255c26c443f338a903cb48d01c Mon Sep 17 00:00:00 2001 From: Fabrice Bacchella Date: Thu, 30 Oct 2014 14:11:08 +0100 Subject: [PATCH 2/2] White space cleaned --- docker/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/client.py b/docker/client.py index 476b1593..f8252b80 100644 --- a/docker/client.py +++ b/docker/client.py @@ -291,7 +291,7 @@ class Client(requests.Session): size = int(size_line, 16) else: break - + if size <= 0: break data = socket.readline()