Various changes

[kiosk.git] / reddit_renderer.py

diff --git a/reddit_renderer.py b/reddit_renderer.py
index dc1a4c59ba6a681b0938ffb14480e313cae715ed..91cd33a43a1a0c78558981091d89b524b5deebb0 100644 (file)
--- a/reddit_renderer.py
+++ b/reddit_renderer.py
@@ -7,6 +7,7 @@ import page_builder
 import praw
 import profanity_filter
 import random
+import renderer_catalog
 
 class reddit_renderer(renderer.debuggable_abstaining_renderer):
     """A renderer to pull text content from reddit."""
@@ -16,7 +17,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()
@@ -64,12 +65,12 @@ class reddit_renderer(renderer.debuggable_abstaining_renderer):
     </TD>
   </TR>
 </TABLE>""" % (self.font_size, content, msg.title, msg.author)
-                    self.messages.add(x.encode('utf8'))
+                    self.messages.add(x)
                 except:
                     self.debug_print('Unexpected exception, skipping message.')
             else:
                 self.debug_print('skipped message "%s" for profanity or low score' % (
-                    msg.title.encode('utf8')))
+                    msg.title))
 
     def scrape_reddit(self):
         self.deduper.clear()