From 1c538eb445e8baeaf93fae88fc36cba4e2f4f7a7 Mon Sep 17 00:00:00 2001 From: Marian Steinbach Date: Mon, 5 Feb 2018 09:46:40 +0100 Subject: [PATCH] Little changes --- service/api/events.py | 4 +++- service/api/main.py | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/service/api/events.py b/service/api/events.py index 212a8a2..9874a7a 100644 --- a/service/api/events.py +++ b/service/api/events.py @@ -5,6 +5,7 @@ import icalendar from datetime import datetime from datetime import date + class Client(object): def __init__(self, url, charset=None): @@ -12,9 +13,10 @@ class Client(object): self.charset = charset self.events = [] self.__load() + self.timeout = 20 def __load(self): - r = requests.get(self.url) + r = requests.get(self.url, timeout=self.timeout) r.raise_for_status() # requests normally uses encoding returned by "Content-type" header. diff --git a/service/api/main.py b/service/api/main.py index c7e16b4..39b0443 100644 --- a/service/api/main.py +++ b/service/api/main.py @@ -23,6 +23,8 @@ class EventsResource(object): client = events.Client(url=ical_url, charset=charset) next_events = client.next_events(num) + del client + resp.media = next_events