From b68ec5f209ce1a48c630c5da7762703c14c39c9f Mon Sep 17 00:00:00 2001 From: Jeff Quast Date: Sat, 14 Feb 2015 16:20:43 -0800 Subject: [PATCH] bugfix KeyError in hackernews.py (bad rss result) --- CHANGES | 1 + x84/default/hackernews.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index d8d32f70..df61e8fe 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,7 @@ - bugfix: ASCII colly diz with extended chars was causing an error - deprecation: the "extras" subfolder of default script has been moved to https://github.com/x84-extras + - bugfix: KeyError in hackernews.py 2.0.5 - bugfix: UnicodeDecodeError when quoting some messages - bugfix: '__uploads__' folder not hidden by sftp as intended diff --git a/x84/default/hackernews.py b/x84/default/hackernews.py index fa28a9f0..ad26108f 100644 --- a/x84/default/hackernews.py +++ b/x84/default/hackernews.py @@ -358,7 +358,13 @@ def view_article_summaries(session, term, rss_url, rss_title): echo(term.move(term.height // 2, 0)) echo(term.center('Fetching {0} ...'.format(term.bold(rss_url))).rstrip()) result = feedparser.parse(rss_url) - assert result['status'] == 200 + if result.get('status') != 200: + # display 404, 500, or whatever non-200 code returned. + moveto_lastline = term.move(term.height, 0) + echo(moveto_lastline) + echo(term.center('failed: status={0}'.format(result.get('status')))) + term.inkey() + return articles = [Article(title=post.title, link=post.link,