More changes to get to python3.

diff --git a/generic_news_rss_renderer.py b/generic_news_rss_renderer.py
index 849c1ad4a643bd724d952215c994567a609409cc..ab59888cdedeae2d23575e48215f365d2d326692 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 += "</TD>\n"
+            blurb += b'</TD>\n'
             details.add_item(blurb)
         g = file_writer.file_writer('%s_6_none.html' % (
             self.get_details_page_prefix()))

diff --git a/reddit_renderer.py b/reddit_renderer.py
index dc1a4c59ba6a681b0938ffb14480e313cae715ed..89ccfb4d885a2b3cf0a40bccc3e9cc52311ceb41 100644 (file)
--- a/reddit_renderer.py
+++ b/reddit_renderer.py
@@ -16,7 +16,7 @@ class reddit_renderer(renderer.debuggable_abstaining_renderer):
         self.subreddit_list = subreddit_list
         self.praw = praw.Reddit(client_id=secrets.reddit_client_id,
                                 client_secret=secrets.reddit_client_secret,
-                                user_agent="Yoshiatsu's Kitchen Kiosk by u/yoshiatsu ver 0.1, See http://wannabe.guru.org/svn/kiosk/trunk/reddit_renderer.py")
+                                user_agent=secrets.reddit_user_agent)
         self.min_votes = min_votes
         self.font_size = font_size
         self.messages = grab_bag.grab_bag()

diff --git a/stranger_renderer.py b/stranger_renderer.py
index 33ccfc05ca2203917bab3ceabc53259ed7c42a12..cad0fd7c642ac615c8001eac11f884a53000fe32 100644 (file)
--- a/stranger_renderer.py
+++ b/stranger_renderer.py
@@ -12,7 +12,7 @@ import renderer
 class stranger_events_renderer(renderer.debuggable_abstaining_renderer):
     def __init__(self, name_to_timeout_dict):
         super(stranger_events_renderer, self).__init__(name_to_timeout_dict, True)
-        self.feed_site = "everout.thestranger.com"
+        self.feed_site = "everout.com"
         self.events = grab_bag.grab_bag()
 
     def debug_prefix(self):
@@ -85,32 +85,32 @@ class stranger_events_renderer(renderer.debuggable_abstaining_renderer):
     def fetch_events(self):
         self.events.clear()
         feed_uris = [
-            "/events/?page=1&picks=true",
-            "/events/?page=2&picks=true",
-            "/events/?page=3&picks=true",
+            "/seattle-stranger/events/?page=1",
+            "/seattle-stranger/events/?page=2",
+            "/seattle-stranger/events/?page=3",
         ]
         now = datetime.datetime.now()
         ts = now + datetime.timedelta(1)
         tomorrow = datetime.datetime.strftime(ts, "%Y-%m-%d")
-        feed_uris.append("/events/?start-date=%s&picks=true" % tomorrow)
+        feed_uris.append("/seattle-stranger/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("/events/?start-date=%s&page=1&picks=true" % next_sat)
-            feed_uris.append("/events/?start-date=%s&page=2&picks=true" % next_sat)
+            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)
         delta += 1
         if delta > 1:
             ts = now + datetime.timedelta(delta)
             next_sun = datetime.datetime.strftime(ts, "%Y-%m-%d")
-            feed_uris.append("/events/?start-date=%s&page=1&picks=true" % next_sun)
-            feed_uris.append("/events/?start-date=%s&page=2&picks=true" % next_sun)
+            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)
 
         for uri in feed_uris:
             try:
-                self.debug_print("fetching '%s'" % uri)
+                self.debug_print("fetching 'https://%s%s'" % (self.feed_site, uri))
                 self.conn = http.client.HTTPSConnection(self.feed_site)
                 self.conn.request(
                     "GET",
@@ -121,6 +121,7 @@ class stranger_events_renderer(renderer.debuggable_abstaining_renderer):
                 if response.status != 200:
                     self.debug_print("Connection failed, status %d" % (
                         response.status))
+                    self.debug_print(response.getheaders())
                     continue
                 raw = response.read()
             except: