1 changed files with 4 additions and 3 deletions
Unified View
Diff Options
-
+4 -3commands/weather.py
+ 4
- 3
commands/weather.py
View File
| @@ -95,7 +95,7 @@ class Weather(Command): | |||||
| desc = "An unknown error occurred." | desc = "An unknown error occurred." | ||||
| self.reply(data, desc) | self.reply(data, desc) | ||||
| elif "current_observation" in res: | elif "current_observation" in res: | ||||
| msg = self.format_weather(res["current_observation"]) | |||||
| msg = self.format_weather(res) | |||||
| self.reply(data, msg) | self.reply(data, msg) | ||||
| elif "results" in res["response"]: | elif "results" in res["response"]: | ||||
| msg = self.format_ambiguous_result(res) | msg = self.format_ambiguous_result(res) | ||||
| @@ -103,11 +103,12 @@ class Weather(Command): | |||||
| else: | else: | ||||
| self.reply(data, "An unknown error occurred.") | self.reply(data, "An unknown error occurred.") | ||||
| def format_weather(self, data): | |||||
| def format_weather(self, res): | |||||
| """Format the weather (as dict *data*) to be sent through IRC.""" | """Format the weather (as dict *data*) to be sent through IRC.""" | ||||
| data = res["current_observation"] | |||||
| place = data["display_location"]["full"] | place = data["display_location"]["full"] | ||||
| icon = self.get_icon(data["icon"], data["local_time_rfc822"], | icon = self.get_icon(data["icon"], data["local_time_rfc822"], | ||||
| data["sun_phase"]) | |||||
| res["sun_phase"]) | |||||
| weather = data["weather"] | weather = data["weather"] | ||||
| temp_f, temp_c = data["temp_f"], data["temp_c"] | temp_f, temp_c = data["temp_f"], data["temp_c"] | ||||
| humidity = data["relative_humidity"] | humidity = data["relative_humidity"] | ||||