More python3 changes.

[kiosk.git] / stranger_renderer.py

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