Skip to content

Commit

Permalink
CHANGE: On App Engine use urlfetch's default deadline if None is pass…
Browse files Browse the repository at this point in the history
…ed (httplib2#10)

* On App Engine use urlfetch's default deadline if None is passed.
  • Loading branch information
Evan Jones authored and stinky2nine committed Jun 15, 2016
1 parent a780bf5 commit 4af7b57
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion python2/httplib2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,7 @@ def fixed_fetch(url, payload=None, method="GET", headers={},
allow_truncated=False, follow_redirects=True,
deadline=None):
if deadline is None:
deadline = socket.getdefaulttimeout() or 5
deadline = socket.getdefaulttimeout()
return fetch(url, payload=payload, method=method, headers=headers,
allow_truncated=allow_truncated,
follow_redirects=follow_redirects, deadline=deadline,
Expand Down

0 comments on commit 4af7b57

Please sign in to comment.