ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bot restart needed. added support for timeouts to http.py, adjusted steam_calc timeout

Browse source
This commit is contained in:
Luke Rogers 2013-09-08 03:26:34 +12:00
parent 909306cfbe
commit 143cd8dc96
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/util/http.py
View file

@ -52,7 +52,7 @@ def get_json(*args, **kwargs):
def open(url, query_params=None, user_agent=None, post_data=None,
referer=None, get_method=None, cookies=False, **kwargs):
referer=None, get_method=None, cookies=False, timeout=None, **kwargs):
if query_params is None:
query_params = {}
@ -78,7 +78,10 @@ def open(url, query_params=None, user_agent=None, post_data=None,
else:
opener = urllib2.build_opener()
return opener.open(request)
if timeout:
return opener.open(request, timeout=timeout)
else:
return opener.open(request)
def prepare_url(url, queries):