diff options
author | Ryan Barrett <git@ryanb.org> | 2014-02-12 00:07:46 -0800 |
---|---|---|
committer | Ryan Barrett <git@ryanb.org> | 2014-02-12 00:07:46 -0800 |
commit | 3118243f371f56ba5b6cf9d7dfcea09c98daa573 (patch) | |
tree | c1b121e979181c7c8b1cfb1bf1744bac1c50ced5 /python2/httplib2/__init__.py | |
parent | 1c31470b54162320ba2628fc45ff9dd9f9738df1 (diff) | |
download | httplib2-3118243f371f56ba5b6cf9d7dfcea09c98daa573.tar.gz |
use socket.getdefaulttimeout() on App Engine as well as off
Diffstat (limited to 'python2/httplib2/__init__.py')
-rw-r--r-- | python2/httplib2/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
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, |