From 103d74a36f2a0bc5d21fc6fd36da0ef1101b513b Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Sat, 10 Dec 2011 14:47:55 +0000 Subject: [PATCH] Fix implementation of feed.getContent. --- src/rss_sqlite.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/rss_sqlite.py b/src/rss_sqlite.py index adebe93..9cbeb82 100644 --- a/src/rss_sqlite.py +++ b/src/rss_sqlite.py @@ -831,13 +831,18 @@ class Feed(BaseObject): return text def getContent(self, id): - contentLink = self.db.execute("SELECT contentLink FROM feed WHERE id=?;", (id,)).fetchone()[0] + """ + Return the content of the article with the specified ID. If + the content is not available, returns None. + """ + contentLink = self.getContentLink(id) try: - file = open(self.entries[id]["contentLink"]) - content = file.read() - file.close() - except: - content = "Content unavailable" + with open(contentLink, 'r') as file: + content = file.read() + except Exception: + logger.exception("Failed get content for %s: reading %s failed", + id, contentLink) + content = None return content def extractDate(self, entry): -- 1.7.9.5