More cleanup.

[kiosk.git] / weather_renderer.py

diff --git a/weather_renderer.py b/weather_renderer.py
index 46d891cf3c6497fcbd5cfdee37d0bb89c0dca7db..f10f1ceb7d132f0e92965e8368b60d404f63409b 100644 (file)
--- a/weather_renderer.py
+++ b/weather_renderer.py
@@ -2,21 +2,22 @@
 
 from datetime import datetime
 import json
-import re
 from typing import Dict, List
-import urllib.request, urllib.error, urllib.parse
+import urllib.request
+import urllib.error
+import urllib.parse
 
 import file_writer
 import renderer
-import secrets
+import kiosk_secrets as secrets
 import random
 
 
-class weather_renderer(renderer.debuggable_abstaining_renderer):
+class weather_renderer(renderer.abstaining_renderer):
     """A renderer to fetch forecast from wunderground."""
 
     def __init__(self, name_to_timeout_dict: Dict[str, int], file_prefix: str) -> None:
-        super(weather_renderer, self).__init__(name_to_timeout_dict, False)
+        super().__init__(name_to_timeout_dict)
         self.file_prefix = file_prefix
 
     def debug_prefix(self) -> str:
@@ -377,7 +378,7 @@ class weather_renderer(renderer.debuggable_abstaining_renderer):
 
                 # Icon
                 f.write(
-                    '  <tr><td colspan=3 height=100><center><img src="/kiosk/pages/images/weather/%s" height=125></center></td></tr>\n'
+                    '  <tr><td colspan=3 height=100><center><img src="/kiosk/images/weather/%s" height=125></center></td></tr>\n'
                     % self.pick_icon(conditions[date], rain[date], snow[date])
                 )