Cleanup

[sid.git] / sid / feeds.py

diff --git a/sid/feeds.py b/sid/feeds.py
index 59cf0843c11aa4778caead41e5e1b7a55c30c015..2cb0964646276bf0ec2e7c5529d18ecb99731b07 100644 (file)
--- a/sid/feeds.py
+++ b/sid/feeds.py
@@ -58,23 +58,23 @@ class FeedMonitor(threading.Thread):
 
         # Cannot resolve address
         if 'status' not in parsed_feed:
-            self.plugin.log.error('Error from "%s": %s.' %
-                    (feed, parsed_feed.bozo_exception.__repr__()))
+            self.plugin.log.error('Error from "%s": %s.',
+                                  feed, parsed_feed.bozo_exception.__repr__())
             return
 
         # unusual return http code
         if parsed_feed.status != 200:
             self.plugin.log.warning(
-                'Got code %(status)d from "%(href)s" (please update).' %
-                    parsed_feed)
+                'Got code %(status)d from "%(href)s" (please update).',
+                parsed_feed)
             return
 
         feed_updated = parsed_feed.feed.get('updated_parsed', None)
 
         # Avoid looping over all posts if possible
         if feed_updated and strtm_to_dtm(feed_updated) < self.last_check:
-            self.plugin.log.debug('updated   : %s' % strtm_to_dtm(feed_updated))
-            self.plugin.log.debug('last check: %s' % self.last_check)
+            self.plugin.log.debug('updated   : %s', strtm_to_dtm(feed_updated))
+            self.plugin.log.debug('last check: %s', self.last_check)
             return
 
         title = '"%s":' % parsed_feed.feed.get('title', 'n/a')
@@ -117,7 +117,7 @@ class FeedMonitor(threading.Thread):
                 try:
                     self.new_posts(feed)
                 except Exception as err:
-                    self.plugin.log.error('feeds thread crashed: %s' % err)
+                    self.plugin.log.error('feeds thread crashed: %s', err)
                     self.plugin.log.error(''.join(traceback.format_exc()))
                     self.thread_killed = True
             self.last_check = datetime.datetime.utcnow()
@@ -136,14 +136,12 @@ class Feeds(Plugin):
         # not working <http://bugs.debian.org/612274>
         # 'http://www.debian.org/News/news',
 
-        # DPN in french
-       'http://www.debian.org/News/weekly/dwn.fr.rdf',
+        # Some packages
+        'https://tracker.debian.org/pkg/prosody/rss',
+        'https://tracker.debian.org/pkg/ejabberd/rss',
 
         # Misc
-       'http://rss.gmane.org/topics/excerpts/gmane.linux.debian.devel.announce',
-       'http://rss.gmane.org/gmane.linux.debian.user.security.announce',
-       'http://planet-fr.debian.net/users/rss20.xml',
-       'http://planet.debian.org/atom.xml',
+        'http://planet.debian.org/atom.xml',
         ]
 
     def __init__(self, bot):
@@ -165,9 +163,7 @@ class Feeds(Plugin):
             return
         html = ['<a href="{0}">{1}</a>'.format(html_escape(u),
                                                html_escape(u[7:])
-                                               ) for u in Feeds.FEEDS]
-        msg = {
-                'mbody': 'Feeds:\n' + '\n'.join(Feeds.FEEDS),
-                'mhtml': 'Feeds:<br />' + '<br />'.join(html),
-                }
+                                              ) for u in Feeds.FEEDS]
+        msg = {'mbody': 'Feeds:\n' + '\n'.join(Feeds.FEEDS),
+               'mhtml': 'Feeds:<br />' + '<br />'.join(html),}
         self.reply(rcv, msg)