diff options
| author | Ben Firshman <ben@firshman.co.uk> | 2016-09-27 12:17:28 +0100 |
|---|---|---|
| committer | Ben Firshman <ben@firshman.co.uk> | 2016-10-03 11:58:08 +0100 |
| commit | 8cb186b62392c16ff7bf4890a202220ef4203f8c (patch) | |
| tree | 85e308539853efa38d848523a4b45250166e2878 | |
| parent | 2b34e0b8e44597b36d888b3f3272641f602cb6da (diff) | |
| download | docker-py-8cb186b62392c16ff7bf4890a202220ef4203f8c.tar.gz | |
Add timeout to from_env
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| -rw-r--r-- | docker/client.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/client.py b/docker/client.py index 47ad09e..23eb529 100644 --- a/docker/client.py +++ b/docker/client.py @@ -108,8 +108,10 @@ class Client( @classmethod def from_env(cls, **kwargs): + timeout = kwargs.pop('timeout', None) version = kwargs.pop('version', None) - return cls(version=version, **kwargs_from_env(**kwargs)) + return cls(timeout=timeout, version=version, + **kwargs_from_env(**kwargs)) def _retrieve_server_version(self): try: |