X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=generic_news_rss_renderer.py;h=ec7a7a5d0e840c65a27284fbb98f9e6ea5e91dd2;hb=3b4fef0ca20b98c670acbaa2899bdb1b35eb12d7;hp=b87ab05caa49ed646ecff87266cfca482576aab5;hpb=4b1f3d8a8b278ca6d62f461ea80c8ea21080c301;p=kiosk.git
diff --git a/generic_news_rss_renderer.py b/generic_news_rss_renderer.py
index b87ab05..ec7a7a5 100644
--- a/generic_news_rss_renderer.py
+++ b/generic_news_rss_renderer.py
@@ -1,7 +1,7 @@
import file_writer
import grab_bag
import renderer
-import httplib
+import http.client
import page_builder
import profanity_filter
import random
@@ -91,7 +91,7 @@ class generic_news_rss_renderer(renderer.debuggable_abstaining_renderer):
return False
for msg in subset:
blurb = msg
- blurb += "\n"
+ blurb += u''
details.add_item(blurb)
g = file_writer.file_writer('%s_6_none.html' % (
self.get_details_page_prefix()))
@@ -107,10 +107,10 @@ class generic_news_rss_renderer(renderer.debuggable_abstaining_renderer):
for uri in self.feed_uris:
if self.should_use_https():
self.debug_print("Fetching: https://%s%s" % (self.feed_site, uri))
- self.conn = httplib.HTTPSConnection(self.feed_site)
+ self.conn = http.client.HTTPSConnection(self.feed_site)
else:
self.debug_print("Fetching: http://%s%s" % (self.feed_site, uri))
- self.conn = httplib.HTTPConnection(self.feed_site)
+ self.conn = http.client.HTTPConnection(self.feed_site)
self.conn.request(
"GET",
uri,
@@ -118,8 +118,8 @@ class generic_news_rss_renderer(renderer.debuggable_abstaining_renderer):
{"Accept-Charset": "utf-8"})
response = self.conn.getresponse()
if response.status != 200:
- print("%s: RSS fetch_news error, response: %d" % (self.page_title,
- response.status))
+ print(("%s: RSS fetch_news error, response: %d" % (self.page_title,
+ response.status)))
self.debug_print(response.read())
return False
@@ -155,34 +155,20 @@ class generic_news_rss_renderer(renderer.debuggable_abstaining_renderer):
font-size:34pt;
-webkit-column-break-inside:avoid;">"""
if image is not None:
- blurb += '\n' % image
- blurb += '
%s' % title
+ blurb += u'' % image
+ blurb += u'
%s' % title
if (description is not None and
self.item_is_interesting_for_article(title, description, item)):
longblurb = blurb
- longblurb += "
"
+ longblurb += u"
"
longblurb += description
- longblurb += ""
+ longblurb += u""
longblurb = longblurb.replace("font-size:34pt",
"font-size:44pt")
- self.details.add(longblurb.encode('utf-8', errors='ignore'))
+ self.details.add(longblurb)
- blurb += ""
- self.news.add(blurb.encode('utf-8', errors='ignore'))
+ blurb += u""
+ self.news.add(blurb)
count += 1
return count > 0
-
-# Test
-#x = generic_news_rss_renderer(
-# {"Fetch News" : 1,
-# "Shuffle News" : 1},
-# "rss.cnn.com",
-# [ "/rss/generic_news_topstories.rss",
-# "/rss/money_latest.rss",
-# "/rss/generic_news_tech.rss",
-# ],
-# "Test" )
-#if x.fetch_news() == 0:
-# print "Error fetching news, no items fetched."
-#x.shuffle_news()