Merge branch 'master' of ssh://git.house:/usr/local/git/base/kiosk

[kiosk.git] / cnn_rss_renderer.py

diff --git a/cnn_rss_renderer.py b/cnn_rss_renderer.py
index ae00dc54f879ac63a81fb600e32528a1cd0078ab..a4c8945bad66d066d00d1b3a203a9f7bc5506b79 100644 (file)
--- a/cnn_rss_renderer.py
+++ b/cnn_rss_renderer.py
@@ -2,7 +2,7 @@
 
 import generic_news_rss_renderer
 import re
-from typing import Dict, List
+from typing import Dict, List, Optional
 import xml
 
 
@@ -14,13 +14,9 @@ class cnn_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
         feed_uris: List[str],
         page_title: str,
     ):
-        super(cnn_rss_renderer, self).__init__(
+        super().__init__(
             name_to_timeout_dict, feed_site, feed_uris, page_title
         )
-        self.debug = True
-
-    def debug_prefix(self) -> str:
-        return f"cnn({self.page_title})"
 
     def get_headlines_page_prefix(self) -> str:
         return f"cnn-{self.page_title}"
@@ -28,12 +24,12 @@ class cnn_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
     def get_details_page_prefix(self) -> str:
         return f"cnn-details-{self.page_title}"
 
-    def munge_description(self, description: str) -> str:
+    def munge_description(self, description: str, item: xml.etree.ElementTree.Element) -> str:
         description = re.sub("[Rr]ead full story for latest details.", "", description)
         description = re.sub("<[^>]+>", "", description)
         return description
 
-    def find_image(self, item: xml.etree.ElementTree.Element) -> str:
+    def find_image(self, item: xml.etree.ElementTree.Element) -> Optional[str]:
         image = item.findtext("media:thumbnail")
         if image is not None:
             image_url = image.get("url")