From 4c13678587f1fa7b23ad5c765ddf3ea056d18eb1 Mon Sep 17 00:00:00 2001
From: Alexander 'Leo' Bergolth <leo@strike.wu.ac.at>
Date: Thu, 30 Mar 2017 16:20:39 +0200
Subject: [PATCH] remove change for timeout=None

---
 requests/adapters.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/requests/adapters.py b/requests/adapters.py
index 8193f84d..937ed13a 100644
--- a/requests/adapters.py
+++ b/requests/adapters.py
@@ -420,14 +420,11 @@ class HTTPAdapter(BaseAdapter):
                 raise ValueError(err)
         elif isinstance(timeout, TimeoutSauce):
             pass
-        elif timeout is not None:
+        else:
             timeout = TimeoutSauce(connect=timeout, read=timeout)
 
         try:
             if not chunked:
-                kwargs = {}
-                if timeout is not None:
-                    kwargs['timeout'] = timeout
                 resp = conn.urlopen(
                     method=request.method,
                     url=url,
@@ -438,7 +435,7 @@ class HTTPAdapter(BaseAdapter):
                     preload_content=False,
                     decode_content=False,
                     retries=self.max_retries,
-                    **kwargs
+                    timeout=timeout
                 )
 
             # Send the request.