Fix and re-enable the MyQ renderer. Small format tweaks to the Twitter renderer.

[kiosk.git] / cnn_rss_renderer.py

diff --git a/cnn_rss_renderer.py b/cnn_rss_renderer.py
index 402d9878fa3f8caf608a839327f9164ce19a05e2..a93b4917d97ac169165fe7fc21f1c16bc2ec677b 100644 (file)
--- a/cnn_rss_renderer.py
+++ b/cnn_rss_renderer.py
@@ -28,10 +28,11 @@ class cnn_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
         return False
 
     def item_is_interesting_for_headlines(self, title, description, item):
-        return "CNN.com" not in title
+        return re.search(r'[Cc][Nn][Nn][A-Za-z]*\.com', title) is None
 
     def item_is_interesting_for_article(self, title, description, item):
-        return len(description) >= 65
+        return (re.search(r'[Cc][Nn][Nn][A-Za-z]*\.com', title) is None and
+                len(description) >= 65)
 
 # Test
 #x = cnn_rss_renderer(
@@ -44,5 +45,5 @@ class cnn_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
 #    ],
 #    "Test" )
 #if x.fetch_news() == 0:
-#    print "Error fetching news, no items fetched."
+#    print("Error fetching news, no items fetched.")
 #x.shuffle_news()