RSS: When deleting a named feed, preserve anonymous feed of the same URL.

Author: progval

plugins/RSS/plugin.py

@@ -287,7 +287,9 @@ def assert_feed_does_not_exist(self, name, url=None):
 
     def register_feed(self, name, url, initial,
             plugin_is_loading, announced=None):
-        self.feed_names[name] = url
+        if name != url:
+            # If name == url, then it's an anonymous feed
+            self.feed_names[name] = url
         self.feeds[url] = Feed(name, url, initial,
                 plugin_is_loading, announced)
 

plugins/RSS/test.py

@@ -111,6 +111,7 @@ def testRemoveAliasedFeed(self, mock):
             self.assertNotError('rss announce remove http://xkcd.com/rss.xml')
             self.assertNotError('rss remove xkcd')
         self.assertEqual(self.irc.getCallback('RSS').feed_names, {})
+        self.assertTrue(self.irc.getCallback('RSS').get_feed('http://xkcd.com/rss.xml'))
 
     @mock_urllib
     def testInitialAnnounceNewest(self, mock):