More python3 changes.

diff --git a/cnn_rss_renderer.py b/cnn_rss_renderer.py
index 7ecfa19b851c11826ba1c52299c3dd691ab2e782..a93b4917d97ac169165fe7fc21f1c16bc2ec677b 100644 (file)
--- a/cnn_rss_renderer.py
+++ b/cnn_rss_renderer.py
@@ -45,5 +45,5 @@ class cnn_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
 #    ],
 #    "Test" )
 #if x.fetch_news() == 0:
-#    print "Error fetching news, no items fetched."
+#    print("Error fetching news, no items fetched.")
 #x.shuffle_news()

diff --git a/generic_news_rss_renderer.py b/generic_news_rss_renderer.py
index ab59888cdedeae2d23575e48215f365d2d326692..ec7a7a5d0e840c65a27284fbb98f9e6ea5e91dd2 100644 (file)
--- a/generic_news_rss_renderer.py
+++ b/generic_news_rss_renderer.py
@@ -91,7 +91,7 @@ class generic_news_rss_renderer(renderer.debuggable_abstaining_renderer):
             return False
         for msg in subset:
             blurb = msg
-            blurb += b'</TD>\n'
+            blurb += u'</TD>'
             details.add_item(blurb)
         g = file_writer.file_writer('%s_6_none.html' % (
             self.get_details_page_prefix()))
@@ -151,38 +151,24 @@ 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 = """<DIV style="padding:8px;
+                blurb = u"""<DIV style="padding:8px;
                                  font-size:34pt;
                                  -webkit-column-break-inside:avoid;">"""
                 if image is not None:
-                    blurb += '<IMG SRC="%s" ALIGN=LEFT HEIGHT=115 style="padding:8px;">\n' % image
-                blurb += '<P><B>%s</B>' % title
+                    blurb += u'<IMG SRC="%s" ALIGN=LEFT HEIGHT=115 style="padding:8px;">' % image
+                blurb += u'<P><B>%s</B>' % title
 
                 if (description is not None and
                     self.item_is_interesting_for_article(title, description, item)):
                     longblurb = blurb
-                    longblurb += "<BR>"
+                    longblurb += u"<BR>"
                     longblurb += description
-                    longblurb += "</DIV>"
+                    longblurb += u"</DIV>"
                     longblurb = longblurb.replace("font-size:34pt",
                                                   "font-size:44pt")
-                    self.details.add(longblurb.encode('utf-8', errors='ignore'))
+                    self.details.add(longblurb)
 
-                blurb += "</DIV>"
-                self.news.add(blurb.encode('utf-8', errors='ignore'))
+                blurb += u"</DIV>"
+                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()

diff --git a/stranger_renderer.py b/stranger_renderer.py
index cad0fd7c642ac615c8001eac11f884a53000fe32..a8698e2be325ab9e5e94554d7d44429165816406 100644 (file)
--- a/stranger_renderer.py
+++ b/stranger_renderer.py
@@ -85,28 +85,28 @@ class stranger_events_renderer(renderer.debuggable_abstaining_renderer):
     def fetch_events(self):
         self.events.clear()
         feed_uris = [
-            "/seattle-stranger/events/?page=1",
-            "/seattle-stranger/events/?page=2",
-            "/seattle-stranger/events/?page=3",
+            "/stranger-seattle/events/?page=1",
+            "/stranger-seattle/events/?page=2",
+            "/stranger-seattle/events/?page=3",
         ]
         now = datetime.datetime.now()
         ts = now + datetime.timedelta(1)
         tomorrow = datetime.datetime.strftime(ts, "%Y-%m-%d")
-        feed_uris.append("/seattle-stranger/events/?start-date=%s" % tomorrow)
+        feed_uris.append("/stranger-seattle/events/?start-date=%s" % tomorrow)
         delta = 5 - now.weekday()
         if delta <= 0:
             delta += 7
         if delta > 1:
             ts = now + datetime.timedelta(delta)
             next_sat = datetime.datetime.strftime(ts, "%Y-%m-%d")
-            feed_uris.append("/seattle-stranger/events/?start-date=%s&page=1" % next_sat)
-            feed_uris.append("/seattle-stranger/events/?start-date=%s&page=2" % next_sat)
+            feed_uris.append("/stranger-seattle/events/?start-date=%s&page=1" % next_sat)
+            feed_uris.append("/stranger-seattle/events/?start-date=%s&page=2" % next_sat)
         delta += 1
         if delta > 1:
             ts = now + datetime.timedelta(delta)
             next_sun = datetime.datetime.strftime(ts, "%Y-%m-%d")
-            feed_uris.append("/seattle-stranger/events/?start-date=%s&page=1" % next_sun)
-            feed_uris.append("/seattle-stranger/events/?start-date=%s&page=2" % next_sun)
+            feed_uris.append("/stranger-seattle/events/?start-date=%s&page=1" % next_sun)
+            feed_uris.append("/stranger-seattle/events/?start-date=%s&page=2" % next_sun)
 
         for uri in feed_uris:
             try:
@@ -142,9 +142,9 @@ class stranger_events_renderer(renderer.debuggable_abstaining_renderer):
                 raw = raw.replace('FREE', 'Free')
                 raw = raw.replace('Save Event', '')
                 raw = re.sub('^\s*$', '', raw, 0, re.MULTILINE)
-                raw = re.sub('\n+', '\n', raw)
+                #raw = re.sub('\n+', '\n', raw)
                 raw = re.sub('<span[^<>]*class="calendar-post-ticket"[^<>]*>.*</#span>', '', raw, 0, re.DOTALL | re.IGNORECASE)
-                self.events.add(raw.encode('utf-8'))
+                self.events.add(raw)
             self.debug_print("fetched %d events so far." % self.events.size())
         return self.events.size() > 0