From 9e1c4e5e56009e4c08ff446b30ec3f6b55fd4a03 Mon Sep 17 00:00:00 2001 From: Ryan Barrett Date: Wed, 12 Feb 2014 22:50:38 -0800 Subject: use socket.getdefaulttimeout() on App Engine as well as off, take 2 the first attempt (3118243f371f56ba5b6cf9d7dfcea09c98daa573) wouldn't set the timeout for clients that passed deadline=None explicitly, which App Engine's httplib often does. this fixes that. --- python2/httplib2/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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, -- cgit v1.2.1