mypy clean

[kiosk.git] / kiosk.py

diff --git a/kiosk.py b/kiosk.py
index f3e358ae027900340e661aec3fa123102239146e..ffcd7863d1a75f0a9bb67cacc3b0ace27a083322 100755 (executable)
--- a/kiosk.py
+++ b/kiosk.py
@@ -1,11 +1,13 @@
 #!/usr/bin/env python3
 
-import sys
-import traceback
+from datetime import datetime
 import os
+import sys
 from threading import Thread
 import time
-from datetime import datetime
+import traceback
+from typing import Optional
+
 import constants
 import renderer
 import renderer
@@ -34,7 +36,7 @@ def thread_change_current() -> None:
     page_chooser = chooser.weighted_random_chooser_with_triggers(
         trigger_catalog.get_triggers(), [filter_news_during_dinnertime]
     )
-    swap_page_target = 0
+    swap_page_target = 0.0
     last_page = ""
     while True:
         now = time.time()
@@ -311,11 +313,6 @@ def thread_invoke_renderers() -> None:
                 print(
                     f"renderer[{utils.timestamp()}] unknown exception in {r.get_name()}, swallowing it."
                 )
-            except Error as e:
-                traceback.print_exc()
-                print(
-                    f"renderer[{utils.timestamp()}] unknown error in {r.get_name()}, swallowing it."
-                )
             delta = time.time() - now
             if delta > 1.0:
                 print(
@@ -329,20 +326,19 @@ def thread_invoke_renderers() -> None:
 
 if __name__ == "__main__":
     logging.basicConfig()
-    changer_thread = None
-    renderer_thread = None
+    changer_thread: Optional[Thread] = None
+    renderer_thread: Optional[Thread] = None
     while True:
-        if changer_thread == None or not changer_thread.is_alive():
+        if changer_thread is None or not changer_thread.is_alive():
             print(
                 f"MAIN[{utils.timestamp()}] - (Re?)initializing chooser thread... (wtf?!)"
             )
             changer_thread = Thread(target=thread_change_current, args=())
             changer_thread.start()
-        if renderer_thread == None or not renderer_thread.is_alive():
+        if renderer_thread is None or not renderer_thread.is_alive():
             print(
                 f"MAIN[{utils.timestamp()}] - (Re?)initializing render thread... (wtf?!)"
             )
             renderer_thread = Thread(target=thread_invoke_renderers, args=())
             renderer_thread.start()
         time.sleep(60)
-    print("Should never get here.")