diff --git a/plugins/choose.py b/plugins/choose.py index c04c20f..37b1077 100755 --- a/plugins/choose.py +++ b/plugins/choose.py @@ -13,6 +13,6 @@ def choose(inp): if len(c) == 1: c = re.findall(r'(\S+)', inp) if len(c) == 1: - return 'the decision is up to you' + return 'The decision is up to you!' return random.choice(c).strip() diff --git a/plugins/spellcheck.py b/plugins/spellcheck.py index 2607753..5f6b244 100755 --- a/plugins/spellcheck.py +++ b/plugins/spellcheck.py @@ -1,11 +1,10 @@ -import re import enchant from util import hook locale = "en_US" -@hook.command("spellcheck") +@hook.command def spell(inp): "spell -- Check spelling of ." @@ -13,16 +12,16 @@ def spell(inp): return "This command only supports one word at a time." if not enchant.dict_exists(locale): - return "Could not find dictionary: %s" % locale + return "Could not find dictionary: {}".format(locale) - dict = enchant.Dict(locale) - is_correct = dict.check(inp) - suggestions = dict.suggest(inp) + dictionary = enchant.Dict(locale) + is_correct = dictionary.check(inp) + suggestions = dictionary.suggest(inp) s_string = ', '.join(suggestions[:10]) if is_correct: - return '"%s" appears to be \x02valid\x02! ' \ - '(suggestions: %s)' % (inp, s_string) + return '"{}" appears to be \x02valid\x02! ' \ + '(suggestions: {})'.format(inp, s_string) else: - return '"%s" appears to be \x02invalid\x02! ' \ - '(suggestions: %s)' % (inp, s_string) + return '"{}" appears to be \x02invalid\x02! ' \ + '(suggestions: {})'.format(inp, s_string) diff --git a/plugins/weather.py b/plugins/weather.py index 177bd85..0e8798f 100755 --- a/plugins/weather.py +++ b/plugins/weather.py @@ -1,16 +1,13 @@ -from util import hook -import yql as YQL +from util import hook, web def get_weather(location): """uses the yahoo weather API to get weather information for a location""" - yql = YQL.Public() - enviroment = "http://datatables.org/alltables.env" query = "SELECT * FROM weather.bylocation WHERE location=@location LIMIT 1" - data = yql.execute(query, {"location": location}, env=enviroment).one() + result = web.query(query, {"location": location}) - data = data["rss"]["channel"] + data = result.rows[0]["rss"]["channel"] # wind conversions data['wind']['chill_c'] = int(round((int(data['wind']['chill']) - 32) / 1.8, 0))