From 75b27cc68871343681f01e3f5b04cae84b1b7b2a Mon Sep 17 00:00:00 2001 From: Scott Gasch Date: Thu, 2 Jul 2020 21:04:48 -0700 Subject: [PATCH] The changes necessary to upgrade the kiosk to use python3.7. --- camera_trigger.py | 12 +++--- chooser.py | 12 +++--- cnn_rss_renderer.py | 5 ++- file_writer.py | 8 ++-- gcal_renderer.py | 7 ++-- gcal_trigger.py | 2 +- gdata_oauth.py | 30 ++++++------- gdocs_renderer.py | 16 +++---- generic_news_rss_renderer.py | 12 +++--- gkeep_renderer.py | 6 +-- kiosk.py | 30 ++++++------- local_photos_mirror_renderer.py | 5 +-- myq_renderer.py | 2 +- myq_trigger.py | 2 +- page_builder.py | 2 +- picasa_renderer.py | 12 +++--- pollen_renderer.py | 8 ++-- profanity_filter.py | 20 ++++----- reddit_renderer.py | 2 +- renderer.py | 12 +++--- renderer_catalog.py | 4 +- reuters_rss_renderer.py | 8 ++-- seattletimes_rss_renderer.py | 3 +- stevens_renderer.py | 4 +- stock_renderer.py | 30 ++++++------- stranger_renderer.py | 74 ++++++++++----------------------- twitter_renderer.py | 8 ++-- weather_renderer.py | 14 +++---- 28 files changed, 161 insertions(+), 189 deletions(-) diff --git a/camera_trigger.py b/camera_trigger.py index 6e63dd1..74829e3 100644 --- a/camera_trigger.py +++ b/camera_trigger.py @@ -73,15 +73,15 @@ class any_camera_trigger(trigger.trigger): if (self.triggers_in_the_past_seven_min[camera] <= 4 or cameras_with_recent_triggers > 1): p = self.choose_priority(camera, age) - print "%s: ****** %s[%d] CAMERA TRIGGER ******" % ( - ts, camera, p) + print(("%s: ****** %s[%d] CAMERA TRIGGER ******" % ( + ts, camera, p))) triggers.append( ( "hidden/%s.html" % camera, self.choose_priority(camera, age)) ) else: - print "%s: Camera %s too spammy, squelching it" % ( - ts, camera) + print(("%s: Camera %s too spammy, squelching it" % ( + ts, camera))) except Exception as e: - print e + print(e) pass if len(triggers) == 0: @@ -90,4 +90,4 @@ class any_camera_trigger(trigger.trigger): return triggers #x = any_camera_trigger() -#print x.get_triggered_page_list() +#print(x.get_triggered_page_list()) diff --git a/chooser.py b/chooser.py index 47a2cb7..f6a9a49 100644 --- a/chooser.py +++ b/chooser.py @@ -18,14 +18,14 @@ class chooser(object): for page in pages: result = re.match(valid_filename, page) if result != None: - print('chooser: candidate page: "%s"' % page) + print(('chooser: candidate page: "%s"' % page)) if (result.group(3) != "none"): freshness_requirement = int(result.group(3)) last_modified = int(os.path.getmtime( os.path.join(constants.pages_dir, page))) age = (now - last_modified) if (age > freshness_requirement): - print ('"%s" is too old.' % page) + print(('"%s" is too old.' % page)) continue filenames.append(page) return filenames @@ -56,12 +56,12 @@ class weighted_random_chooser(chooser): total_weight += weight if (total_weight <= 0): - raise(error("No valid candidate pages found!")) + raise error while True: pick = random.randrange(0, total_weight - 1) so_far = 0 - for x in xrange(0, len(weights)): + for x in range(0, len(weights)): so_far += weights[x] if (so_far > pick and self.pages[x] != self.last_choice): @@ -95,7 +95,7 @@ class weighted_random_chooser_with_triggers(weighted_random_chooser): # First try to satisfy from the page queue if (len(self.page_queue) > 0): - print "Pulling page from queue" + print("Pulling page from queue") page = None priority = None for t in self.page_queue: @@ -123,7 +123,7 @@ class rotating_chooser(chooser): self.pages = self.get_page_list() if len(self.pages) == 0: - raise(error("No pages!")) + raise error if (self.current >= len(self.pages)): self.current = 0 diff --git a/cnn_rss_renderer.py b/cnn_rss_renderer.py index 402d987..7ecfa19 100644 --- a/cnn_rss_renderer.py +++ b/cnn_rss_renderer.py @@ -28,10 +28,11 @@ class cnn_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer): return False def item_is_interesting_for_headlines(self, title, description, item): - return "CNN.com" not in title + return re.search(r'[Cc][Nn][Nn][A-Za-z]*\.com', title) is None def item_is_interesting_for_article(self, title, description, item): - return len(description) >= 65 + return (re.search(r'[Cc][Nn][Nn][A-Za-z]*\.com', title) is None and + len(description) >= 65) # Test #x = cnn_rss_renderer( diff --git a/file_writer.py b/file_writer.py index aba7d8f..0d95f71 100644 --- a/file_writer.py +++ b/file_writer.py @@ -4,9 +4,9 @@ import os def remove_tricky_unicode(x): try: x = x.decode('utf-8') - x = x.replace(u"\u2018", "'").replace(u"\u2019", "'") - x = x.replace(u"\u201c", '"').replace(u"\u201d", '"') - x = x.replace(u"\u2e3a", "-").replace(u"\u2014", "-") + x = x.replace("\u2018", "'").replace("\u2019", "'") + x = x.replace("\u201c", '"').replace("\u201d", '"') + x = x.replace("\u2e3a", "-").replace("\u2014", "-") except: pass return x @@ -15,7 +15,7 @@ class file_writer: def __init__(self, filename): self.full_filename = os.path.join(constants.pages_dir, filename) - self.f = open(self.full_filename, 'w') + self.f = open(self.full_filename, 'wb') self.xforms = [ remove_tricky_unicode ] def add_xform(self, xform): diff --git a/gcal_renderer.py b/gcal_renderer.py index 1609e92..c3be3d7 100644 --- a/gcal_renderer.py +++ b/gcal_renderer.py @@ -6,13 +6,12 @@ import gdata import globals import os import renderer -import sets import time class gcal_renderer(renderer.debuggable_abstaining_renderer): """A renderer to fetch upcoming events from www.google.com/calendar""" - calendar_whitelist = sets.ImmutableSet([ + calendar_whitelist = frozenset([ 'Alex\'s calendar', 'Family', 'Holidays in United States', @@ -89,7 +88,7 @@ class gcal_renderer(renderer.debuggable_abstaining_renderer): return datetime.datetime.strftime(x, '%Y-%m-%dT%H:%M:%SZ') time_min = datetime.datetime.now() time_max = time_min + datetime.timedelta(95) - time_min, time_max = map(format_datetime, (time_min, time_max)) + time_min, time_max = list(map(format_datetime, (time_min, time_max))) self.debug_print("time_min is %s" % time_min) self.debug_print("time_max is %s" % time_max) @@ -197,7 +196,7 @@ class gcal_renderer(renderer.debuggable_abstaining_renderer): name, days[0], hours[0], minutes[0])) g.write('') g.write('