From 30fac5b8799a50fbe837a674de15408c001f3f0e Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 24 Jun 2015 22:58:56 +0200 Subject: Fix stop timeout bug --- docker/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/client.py') diff --git a/docker/client.py b/docker/client.py index f63da50..8bcc419 100644 --- a/docker/client.py +++ b/docker/client.py @@ -1101,7 +1101,7 @@ class Client(requests.Session): url = self._url("/containers/{0}/stop".format(container)) res = self._post(url, params=params, - timeout=(timeout + self.timeout)) + timeout=(timeout + (self.timeout or 0))) self._raise_for_status(res) @check_resource -- cgit v1.2.1