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/nr.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/nr.py') diff --git a/modules/nr.py b/modules/nr.py index e01e3c3c..1afb0044 100644 --- a/modules/nr.py +++ b/modules/nr.py @@ -235,10 +235,10 @@ class Module(ModuleManager.BaseModule): trains.append(parsed) if eagle_url: - summary_query = utils.http.get_url("%s/json/summaries/%s?uids=%s" % (eagle_url, now.date().isoformat(), "%20".join([a["uid"] for a in trains])), json=True, headers={"x-eagle-key": self.bot.config["eagle-api-key"]}) + summary_query = utils.http.request("%s/json/summaries/%s?uids=%s" % (eagle_url, now.date().isoformat(), "%20".join([a["uid"] for a in trains])), json=True, headers={"x-eagle-key": self.bot.config["eagle-api-key"]}) if summary_query: for t in trains: - summary = summary_query[t["uid"]] + summary = summary_query.data[t["uid"]] t.update(summary) summary_plat = summary.get("platforms", {}).get(query["crs"]) if summary_plat and t["platform"]=="?": @@ -333,9 +333,9 @@ class Module(ModuleManager.BaseModule): query = client.service.QueryServices(service_id, datetime.utcnow().date().isoformat(), datetime.utcnow().time().strftime("%H:%M:%S+0000")) if eagle_url: - schedule_query = utils.http.get_url("%s/json/schedule/%s/%s" % (eagle_url, service_id, datetime.now().date().isoformat()), json=True, headers={"x-eagle-key": eagle_key}) + schedule_query = utils.http.request("%s/json/schedule/%s/%s" % (eagle_url, service_id, datetime.now().date().isoformat()), json=True, headers={"x-eagle-key": eagle_key}) if schedule_query: - schedule = schedule_query["current"] + schedule = schedule_query.data["current"] if not query and not schedule: return event["stdout"].write("No service information is available for this identifier.") -- cgit v1.3.1-10-gc9f91