diff options
Diffstat (limited to 'docker/client.py')
-rw-r--r-- | docker/client.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |