cadey
/
h
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modified http util to support additional headers 

Inverted some header logic

Removed user_agent and referer from http, in favor of headers dict

http: formatting

http: Fixed missing part in conditional
This commit is contained in:
Parker Smith 2014-01-19 01:49:25 -05:00 committed by Parker Smith
parent cb8c437772
commit d878779d50
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/dictionary.py
View File

@ -9,7 +9,7 @@ def urban(inp):
'''.u/.urban <phrase> -- looks up <phrase> on urbandictionary.com''' '''.u/.urban <phrase> -- looks up <phrase> on urbandictionary.com'''
url = 'http://www.urbandictionary.com/iphone/search/define' url = 'http://www.urbandictionary.com/iphone/search/define'
page = http.get_json(url, term=inp, referer="http://m.urbandictionary.com") page = http.get_json(url, term=inp, headers={'Referer': 'http://m.urbandictionary.com'})
defs = page['list'] defs = page['list']
if page['result_type'] == 'no_results': if page['result_type'] == 'no_results':

20
plugins/util/http.py
View File

@ -20,7 +20,7 @@ from lxml import etree, html
ua_skybot = 'Skybot/1.0 http://github.com/rmmh/skybot' ua_skybot = 'Skybot/1.0 http://github.com/rmmh/skybot'
ua_firefox = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.6) ' \ ua_firefox = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.6) ' \
'Gecko/20070725 Firefox/2.0.0.6' 'Gecko/20070725 Firefox/2.0.0.6'
ua_internetexplorer = 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)' ua_internetexplorer = 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)'
jar = cookielib.CookieJar() jar = cookielib.CookieJar()
@ -42,15 +42,11 @@ def get_json(*args, **kwargs):
return json.loads(get(*args, **kwargs)) return json.loads(get(*args, **kwargs))
def open(url, query_params=None, user_agent=None, referer=None, post_data=None, def open(url, query_params=None, post_data=None,
get_method=None, cookies=False, oauth=False, oauth_keys=None, **kwargs): get_method=None, cookies=False, oauth=False, oauth_keys=None, headers=None, **kwargs):
if query_params is None: if query_params is None:
query_params = {} query_params = {}
if user_agent is None:
user_agent = ua_skybot
query_params.update(kwargs) query_params.update(kwargs)
url = prepare_url(url, query_params) url = prepare_url(url, query_params)
@ -60,10 +56,12 @@ def open(url, query_params=None, user_agent=None, referer=None, post_data=None,
if get_method is not None: if get_method is not None:
request.get_method = lambda: get_method request.get_method = lambda: get_method
request.add_header('User-Agent', user_agent) if headers is not None:
for header_key, header_value in headers.iteritems():
request.add_header(header_key, header_value)
if referer is not None: if 'User-Agent' not in request.headers:
request.add_header('Referer', referer) request.add_header('User-Agent', ua_skybot)
if oauth: if oauth:
nonce = oauth_nonce() nonce = oauth_nonce()
@ -73,7 +71,7 @@ def open(url, query_params=None, user_agent=None, referer=None, post_data=None,
nonce, timestamp, req_data, oauth_keys['consumer'], oauth_keys['access']) nonce, timestamp, req_data, oauth_keys['consumer'], oauth_keys['access'])
signature = oauth_sign_request("GET", api_url, req_data, unsigned_request, oauth_keys[ signature = oauth_sign_request("GET", api_url, req_data, unsigned_request, oauth_keys[
'consumer_secret'], oauth_keys['access_secret']) 'consumer_secret'], oauth_keys['access_secret'])
header = oauth_build_header( header = oauth_build_header(
nonce, signature, timestamp, oauth_keys['consumer'], oauth_keys['access']) nonce, signature, timestamp, oauth_keys['consumer'], oauth_keys['access'])