From f69b9209be077b5298acfd3ac52ed0809b20eb76 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 11 Feb 2014 17:05:17 -0500 Subject: [PATCH] rss: Support feeds that don't provide any sort of timestamp. (imported from commit 9acc9dad7543a0e0a6bc2e71360b7017c3c7c63d) --- integrations/rss/rss-bot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integrations/rss/rss-bot b/integrations/rss/rss-bot index a59434f..0511e2b 100755 --- a/integrations/rss/rss-bot +++ b/integrations/rss/rss-bot @@ -136,7 +136,7 @@ def strip_tags(html): def compute_entry_hash(entry): entry_time = entry.get("published", entry.get("updated")) entry_id = entry.get("id", entry.get("link")) - return hashlib.md5(entry_id + entry_time).hexdigest() + return hashlib.md5(entry_id + str(entry_time)).hexdigest() def elide_subject(subject): MAX_TOPIC_LENGTH = 60 @@ -184,7 +184,7 @@ for feed_url in feed_urls: entry_hash = compute_entry_hash(entry) # An entry has either been published or updated. entry_time = entry.get("published_parsed", entry.get("updated_parsed")) - if (time.time() - calendar.timegm(entry_time)) > OLDNESS_THRESHOLD * 60 * 60 * 24: + if entry_time is not None and (time.time() - calendar.timegm(entry_time)) > OLDNESS_THRESHOLD * 60 * 60 * 24: # As a safeguard against misbehaving feeds, don't try to process # entries older than some threshold. continue