From 793d234a0b924c0330e88f07f68b13559b42e4ac Mon Sep 17 00:00:00 2001 From: jesopo Date: Tue, 11 Dec 2018 22:26:38 +0000 Subject: 'utils.http.get_url' -> 'utils.http.request', return a Response object from utils.http.request --- modules/weather.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'modules/weather.py') diff --git a/modules/weather.py b/modules/weather.py index b5d79a8a..ddf7a1a6 100644 --- a/modules/weather.py +++ b/modules/weather.py @@ -12,19 +12,19 @@ class Module(ModuleManager.BaseModule): :usage: """ api_key = self.bot.config["openweathermap-api-key"] - page = utils.http.get_url(URL_WEATHER, get_params={ + page = utils.http.request(URL_WEATHER, get_params={ "q": event["args"], "units": "metric", "APPID": api_key}, json=True) if page: - if "weather" in page: - location = "%s, %s" % (page["name"], page["sys"][ + if "weather" in page.data: + location = "%s, %s" % (page.data["name"], page.data["sys"][ "country"]) - celsius = "%dC" % page["main"]["temp"] - fahrenheit = "%dF" % ((page["main"]["temp"]*(9/5))+32) - description = page["weather"][0]["description"].title() - humidity = "%s%%" % page["main"]["humidity"] - wind_speed = "%sKM/h" % page["wind"]["speed"] + celsius = "%dC" % page.data["main"]["temp"] + fahrenheit = "%dF" % ((page.data["main"]["temp"]*(9/5))+32) + description = page.data["weather"][0]["description"].title() + humidity = "%s%%" % page.data["main"]["humidity"] + wind_speed = "%sKM/h" % page.data["wind"]["speed"] event["stdout"].write( "(%s) %s/%s | %s | Humidity: %s | Wind: %s" % ( -- cgit v1.3.1-10-gc9f91