From 8cb186b62392c16ff7bf4890a202220ef4203f8c Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Tue, 27 Sep 2016 12:17:28 +0100
Subject: [PATCH] Add timeout to from_env

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 docker/client.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker/client.py b/docker/client.py
index 47ad09e9..23eb5298 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: