Merge pull request #57 from Atheuz/master

UrbanDictionary fixed, required me to change http.py - Also minor nitpick with stock.py
This commit is contained in:
Ryan Hitchman 2013-01-27 13:15:51 -08:00
commit d4461c2b29
4 changed files with 8 additions and 5 deletions

View File

@ -9,13 +9,13 @@ def urban(inp):
'''.u/.urban <phrase> -- looks up <phrase> on urbandictionary.com'''
url = 'http://www.urbandictionary.com/iphone/search/define'
page = http.get_json(url, term=inp)
page = http.get_json(url, term=inp, referer="http://m.urbandictionary.com")
defs = page['list']
if page['result_type'] == 'no_results':
return 'not found.'
out = defs[0]['word'] + ': ' + defs[0]['definition']
out = defs[0]['word'] + ': ' + defs[0]['definition'].replace('\r\n',' ')
if len(out) > 400:
out = out[:out.rfind(' ', 0, 400)] + '...'

View File

@ -7,7 +7,7 @@ from util import hook, http
def imdb(inp):
'''.imdb <movie> -- gets information about <movie> from IMDb'''
content = http.get_json("http://www.imdbapi.com/", t=inp)
content = http.get_json("http://www.omdbapi.com/", t=inp)
if content['Response'] == 'Movie Not Found':
return 'movie not found'

View File

@ -28,7 +28,7 @@ def stock(inp):
results['color'] = "3"
ret = "%(company)s - %(last)s %(currency)s " \
"\x03%(color)s%(change)s (%(perc_change)s)\x03 " \
"\x03%(color)s%(change)s (%(perc_change)s%%)\x03 " \
"as of %(trade_timestamp)s" % results
if results['delay'] != '0':

View File

@ -37,7 +37,7 @@ def get_json(*args, **kwargs):
return json.loads(get(*args, **kwargs))
def open(url, query_params=None, user_agent=None, post_data=None,
def open(url, query_params=None, user_agent=None, referer=None, post_data=None,
get_method=None, cookies=False, **kwargs):
if query_params is None:
@ -57,6 +57,9 @@ def open(url, query_params=None, user_agent=None, post_data=None,
request.add_header('User-Agent', user_agent)
if referer is not None:
request.add_header('Referer', referer)
if cookies:
opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(jar))
else: