Merge pull request #259 from snarfed/master

Use socket.getdefaulttimeout() on App Engine as well as off, take 2: set the timeout for clients that passed deadline=None explicitly.

1 files changed, 3 insertions, 1 deletions

diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py
index b558374..8825e5d 100644
--- a/python2/httplib2/__init__.py
+++ b/python2/httplib2/__init__.py
@@ -1082,7 +1082,9 @@ try:
     def _new_fixed_fetch(validate_certificate):
         def fixed_fetch(url, payload=None, method="GET", headers={},
                         allow_truncated=False, follow_redirects=True,
-                        deadline=socket.getdefaulttimeout() or 5):
+                        deadline=None):
+            if deadline is None:
+                deadline = socket.getdefaulttimeout() or 5
             return fetch(url, payload=payload, method=method, headers=headers,
                          allow_truncated=allow_truncated,
                          follow_redirects=follow_redirects, deadline=deadline,