aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcedricbonhomme <devnull@localhost>2010-02-25 18:55:08 +0100
committercedricbonhomme <devnull@localhost>2010-02-25 18:55:08 +0100
commit88b9410c3e08c606b4313550ae31a1fc043b993a (patch)
tree161a7a3e3247a7fe8b05869b1ac085cab29cbc55
parentAdded a default RSS icon for feeds without RSS icon. (diff)
downloadnewspipe-88b9410c3e08c606b4313550ae31a1fc043b993a.tar.gz
newspipe-88b9410c3e08c606b4313550ae31a1fc043b993a.tar.bz2
newspipe-88b9410c3e08c606b4313550ae31a1fc043b993a.zip
Minor enhancement.
-rw-r--r--feedgetter.py3
-rw-r--r--pyAggr3g470r.py5
2 files changed, 2 insertions, 6 deletions
diff --git a/feedgetter.py b/feedgetter.py
index 2878d943..c66d7a0f 100644
--- a/feedgetter.py
+++ b/feedgetter.py
@@ -106,9 +106,8 @@ class FeedGetter(object):
return
try:
feed_image = a_feed.feed.image.href
- print feed_image
except:
- feed_image = ""
+ feed_image = "/css/img/feed-icon-28x28.png"
try:
self.c.execute('insert into feeds values (?,?,?,?)', (\
a_feed.feed.title.encode('utf-8'), \
diff --git a/pyAggr3g470r.py b/pyAggr3g470r.py
index 4748a3eb..80edb43f 100644
--- a/pyAggr3g470r.py
+++ b/pyAggr3g470r.py
@@ -85,15 +85,12 @@ class Root:
html += """</div>\n<div class="left inner">\n"""
for rss_feed_id in self.dic.keys():
- feed_link = self.dic_info[rss_feed_id][2].encode('utf-8')
- if not feed_link:
- feed_link = "/css/img/feed-icon-28x28.png"
html += """<h2><a name="%s"><a href="%s" rel="noreferrer"
target="_blank">%s</a></a>
<img src="%s" width="28" height="28" /></h2>\n""" % \
(rss_feed_id, self.dic[rss_feed_id][0][6].encode('utf-8'), \
self.dic[rss_feed_id][0][5].encode('utf-8'), \
- feed_link)
+ self.dic_info[rss_feed_id][2].encode('utf-8'))
# The main page display only 10 articles by feeds.
for article in self.dic[rss_feed_id][:10]:
bgstack15