From 4302f102e84e82ba4b6918b53ed05705cdcb56dc Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Mon, 10 Dec 2012 16:06:28 -0800 Subject: [PATCH] Fixing broken OPML exporter for broken feeds. --- apps/feed_import/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/feed_import/models.py b/apps/feed_import/models.py index 79938dce2..a148c0202 100644 --- a/apps/feed_import/models.py +++ b/apps/feed_import/models.py @@ -65,7 +65,7 @@ class OPMLExporter: if isinstance(obj, int) and obj in self.feeds: feed = self.feeds[obj] if verbose: - print " ---> Adding feed: %s - %s" % (feed['pk'], + print " ---> Adding feed: %s - %s" % (feed['id'], feed['feed_title'][:30]) feed_attrs = self.make_feed_row(feed) body.append(Element('outline', feed_attrs)) @@ -74,7 +74,7 @@ class OPMLExporter: if verbose: print " ---> Adding folder: %s" % folder_title folder_element = Element('outline', {'text': folder_title, 'title': folder_title}) - body.append(self.process_outline(folder_element, folder_objs)) + body.append(self.process_outline(folder_element, folder_objs, verbose=verbose)) return body def make_feed_row(self, feed): @@ -83,8 +83,8 @@ class OPMLExporter: 'title': feed['feed_title'], 'type': 'rss', 'version': 'RSS', - 'htmlUrl': feed['feed_link'], - 'xmlUrl': feed['feed_address'], + 'htmlUrl': feed['feed_link'] or "", + 'xmlUrl': feed['feed_address'] or "", } return feed_attrs