From a0e4171af364eee1ba3cbd85d2c3fa15e3e5ed64 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Sat, 18 Feb 2012 17:40:22 +0100 Subject: [PATCH] fix Newsfeed and GenericBackend --- modules/presseurop/browser.py | 1 - weboob/tools/capabilities/messages/GenericBackend.py | 2 +- weboob/tools/newsfeed.py | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/presseurop/browser.py b/modules/presseurop/browser.py index 9caf45d0..cc6777d0 100644 --- a/modules/presseurop/browser.py +++ b/modules/presseurop/browser.py @@ -39,7 +39,6 @@ class NewspaperPresseuropBrowser(BaseBrowser): def get_content(self, _id): "return page article content" - print _id self.location(_id) return self.page.get_article(_id) diff --git a/weboob/tools/capabilities/messages/GenericBackend.py b/weboob/tools/capabilities/messages/GenericBackend.py index 0c205d1f..82e7fe9b 100644 --- a/weboob/tools/capabilities/messages/GenericBackend.py +++ b/weboob/tools/capabilities/messages/GenericBackend.py @@ -72,7 +72,7 @@ class GenericNewspaperBackend(BaseBackend, ICapMessages): return thread def iter_threads(self): - for article in Newsfeed(self.RSS_FEED, self.RSSID).iter_entries(): + for article in Newsfeed(self.RSS_FEED, GenericNewspaperBackend.RSSID).iter_entries(): thread = Thread(article.id) thread.title = article.title thread.date = article.datetime diff --git a/weboob/tools/newsfeed.py b/weboob/tools/newsfeed.py index aa8e4379..784349fa 100644 --- a/weboob/tools/newsfeed.py +++ b/weboob/tools/newsfeed.py @@ -31,11 +31,6 @@ __all__ = ['Entry', 'Newsfeed'] class Entry: def __init__(self, entry, rssid_func=None): - if rssid_func: - self.id = rssid_func(entry) - else: - self.id = entry.id - if entry.has_key("link"): self.link = entry["link"] else: @@ -68,6 +63,11 @@ class Entry: elif self.summary: self.content.append(self.summary) + if rssid_func: + self.id = rssid_func(self) + else: + self.id = entry.id + class Newsfeed: def __init__(self, url, rssid_func=None): self.feed = feedparser.parse(url)