The changes necessary to upgrade the kiosk to use python3.7.

[kiosk.git] / gcal_renderer.py

diff --git a/gcal_renderer.py b/gcal_renderer.py
index 1609e9228322c39d635f41c5c357e6c657efde8a..c3be3d70164bbf9c55f4450c16c64a41cf185fd8 100644 (file)
--- 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('</ul>')
             g.write('<SCRIPT>\nlet timestampMap = new Map([')
-            for x in timestamps.keys():
+            for x in list(timestamps.keys()):
                 g.write('    ["%s", %f],\n' % (x, timestamps[x] * 1000.0))
             g.write(']);\n\n')
             g.write("""