diff options
author | Joe Gregorio <joe@bitworking.org> | 2014-02-12 14:32:39 -0500 |
---|---|---|
committer | Joe Gregorio <joe@bitworking.org> | 2014-02-12 14:32:39 -0500 |
commit | f09a96284e1f522022a6b4758ad67d566bc0d671 (patch) | |
tree | c1b121e979181c7c8b1cfb1bf1744bac1c50ced5 | |
parent | 1c31470b54162320ba2628fc45ff9dd9f9738df1 (diff) | |
parent | 3118243f371f56ba5b6cf9d7dfcea09c98daa573 (diff) | |
download | httplib2-f09a96284e1f522022a6b4758ad67d566bc0d671.tar.gz |
Merge pull request #258 from snarfed/master
Use socket.getdefaulttimeout() on App Engine also.
-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, |