Various changes

[kiosk.git] / gcal_renderer.py

diff --git a/gcal_renderer.py b/gcal_renderer.py
index 1609e9228322c39d635f41c5c357e6c657efde8a..a248d1d93ff13fc3d8ecda322f9720ab8b240395 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',
@@ -87,16 +86,17 @@ class gcal_renderer(renderer.debuggable_abstaining_renderer):
         page_token = None
         def format_datetime(x):
             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))
+        now = datetime.datetime.now()
+        time_min = now - datetime.timedelta(1)
+        time_max = now + datetime.timedelta(95)
+        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)
 
         # Writes 2 files:
         #  + "upcoming events",
         #  + a countdown timer for a subser of events,
-        f = file_writer.file_writer('gcal_3_none.html')
+        f = file_writer.file_writer('gcal_3_86400.html')
         f.write('<h1>Upcoming Calendar Events:</h1><hr>\n')
         f.write('<center><table width=96%>\n')
 
@@ -197,7 +197,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("""