Dem nazis

This commit is contained in:
Luke Rogers 2012-09-12 07:39:15 +12:00
parent 24d6c059e1
commit f2e117eb07

View file

@ -103,7 +103,7 @@ def weather(inp, nick="", reply=None, db=None, notice=None):
return "Could not get weather for that location." return "Could not get weather for that location."
# put all the stuff we want to use in a dictionary for easy formatting of the output # put all the stuff we want to use in a dictionary for easy formatting of the output
weather = { weather_data = {
"place": data['location']['city'], "place": data['location']['city'],
"conditions": data['item']['condition']['text'], "conditions": data['item']['condition']['text'],
"temp_f": data['item']['condition']['temp'], "temp_f": data['item']['condition']['temp'],
@ -120,8 +120,8 @@ def weather(inp, nick="", reply=None, db=None, notice=None):
} }
reply("\x02{place}\x02 - \x02Current Conditions:\x02 {conditions}, {temp_f}F/{temp_c}C, Humidity: {humidity}%, " \ reply("\x02{place}\x02 - \x02Current Conditions:\x02 {conditions}, {temp_f}F/{temp_c}C, Humidity: {humidity}%, " \
"Wind: {wind_kph}KPH/{wind_mph}MPH {wind_text}, \x02Todays Forecast:\x02 {forecast}, " \ "Wind: {wind_kph}KPH/{wind_mph}MPH {wind_text}, \x02Today's Forecast:\x02 {forecast}, " \
"High: {high_f}F/{high_c}C, Low: {low_f}F/{low_c}C.".format(**weather)) "High: {high_f}F/{high_c}C, Low: {low_f}F/{low_c}C.".format(**weather_data))
if location and not dontsave: if location and not dontsave:
db.execute("insert or replace into weather(nick, loc) values (?,?)", db.execute("insert or replace into weather(nick, loc) values (?,?)",