The changes necessary to upgrade the kiosk to use python3.7.

[kiosk.git] / generic_news_rss_renderer.py

diff --git a/generic_news_rss_renderer.py b/generic_news_rss_renderer.py
index b87ab05caa49ed646ecff87266cfca482576aab5..849c1ad4a643bd724d952215c994567a609409cc 100644 (file)
--- 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
@@ -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
 
@@ -151,7 +151,7 @@ class generic_news_rss_renderer(renderer.debuggable_abstaining_renderer):
                 #print u"Title: %s\nDescription: %s\nLink: %s\nImage: %s\n" % (
                 #    title, description, link, image)
 
-                blurb = u"""<DIV style="padding:8px;
+                blurb = """<DIV style="padding:8px;
                                  font-size:34pt;
                                  -webkit-column-break-inside:avoid;">"""
                 if image is not None: