From 465ca0573bfa65b44ff27d9b6ef96f8ebc4737a6 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 30 Jun 2019 07:07:10 +0530 Subject: [PATCH] News download: Fix the check for empty feeds when generating man ToC page Fixes #1834684 [TOC missing in news download (Python 3)](https://bugs.launchpad.net/calibre/+bug/1834684) --- src/calibre/web/feeds/__init__.py | 6 ------ src/calibre/web/feeds/templates.py | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/calibre/web/feeds/__init__.py b/src/calibre/web/feeds/__init__.py index 46a1f964d0..bf194337e2 100644 --- a/src/calibre/web/feeds/__init__.py +++ b/src/calibre/web/feeds/__init__.py @@ -243,12 +243,6 @@ class Feed(object): def __str__(self): return repr(self) - def __bool__(self): - for article in self: - if getattr(article, 'downloaded', False): - return True - return False - def has_embedded_content(self): length = 0 for a in self: diff --git a/src/calibre/web/feeds/templates.py b/src/calibre/web/feeds/templates.py index a8c05fc614..71985831a5 100644 --- a/src/calibre/web/feeds/templates.py +++ b/src/calibre/web/feeds/templates.py @@ -102,7 +102,7 @@ class IndexTemplate(Template): head.append(STYLE(extra_css, type='text/css')) ul = UL(attrs('calibre_feed_list')) for i, feed in enumerate(feeds): - if feed: + if len(feed): li = LI(A(feed.title, attrs('feed', rescale=120, href='feed_%d/index.html'%i)), id='feed_%d'%i) ul.append(li) @@ -265,7 +265,7 @@ class TouchscreenIndexTemplate(Template): toc = TABLE(attrs('toc'),width="100%",border="0",cellpadding="3px") for i, feed in enumerate(feeds): - if feed: + if len(feed): tr = TR() tr.append(TD(attrs(rescale=120), A(feed.title, href='feed_%d/index.html'%i))) tr.append(TD('%s' % len(feed.articles), style="text-align:right"))