From 3118243f371f56ba5b6cf9d7dfcea09c98daa573 Mon Sep 17 00:00:00 2001 From: Ryan Barrett Date: Wed, 12 Feb 2014 00:07:46 -0800 Subject: use socket.getdefaulttimeout() on App Engine as well as off --- python2/httplib2/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python2/httplib2/__init__.py b/python2/httplib2/__init__.py index 8e9f0fe..b558374 100644 --- a/python2/httplib2/__init__.py +++ b/python2/httplib2/__init__.py @@ -1082,7 +1082,7 @@ try: def _new_fixed_fetch(validate_certificate): def fixed_fetch(url, payload=None, method="GET", headers={}, allow_truncated=False, follow_redirects=True, - deadline=5): + 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