RSS: Remove local/feedparser and add it to install_requires

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>

plugins/RSS/local/__init__.py

@@ -1 +0,0 @@
-# Stub so local is a module, used for third-party modules

plugins/RSS/plugin.py

@@ -33,6 +33,7 @@ import time
 import socket
 import sgmllib
 import threading
+import feedparser
 
 import supybot.conf as conf
 import supybot.utils as utils
@@ -42,13 +43,6 @@ import supybot.ircutils as ircutils
 import supybot.registry as registry
 import supybot.callbacks as callbacks
 
-try:
-    feedparser = utils.python.universalImport('feedparser', 'local.feedparser')
-except ImportError:
-    raise callbacks.Error, \
-            'You the feedparser module installed to use this plugin.  ' \
-            'Download the module at <http://feedparser.org/>.'
-
 def getFeedName(irc, msg, args, state):
     if not registry.isValidRegistryName(args[0]):
         state.errorInvalid('feed name', args[0],

plugins/RSS/test.py

@@ -77,7 +77,6 @@ class RSSTestCase(ChannelPluginTestCase):
 
         def testNonAsciiFeeds(self):
             self.assertNotError('rss http://www.heise.de/newsticker/heise.rdf')
-            self.assertNotError('rss http://www.golem.de/rss.php?feed=ATOM0.3')
             self.assertNotError('rss info http://br-linux.org/main/index.xml')
 
 

setup.py

@@ -66,7 +66,6 @@ packages = ['supybot',
             [
              'supybot.plugins.Dict.local',
              'supybot.plugins.Math.local',
-             'supybot.plugins.RSS.local',
             ]
 
 package_dir = {'supybot': 'src',
@@ -75,7 +74,6 @@ package_dir = {'supybot': 'src',
                'supybot.drivers': 'src/drivers',
                'supybot.plugins.Dict.local': 'plugins/Dict/local',
                'supybot.plugins.Math.local': 'plugins/Math/local',
-               'supybot.plugins.RSS.local': 'plugins/RSS/local',
               }
 
 for plugin in plugins:
@@ -128,6 +126,7 @@ setup(
     install_requires=[
         # Time plugin
         'python-dateutil <2.0,>=1.3',
+        'feedparser',
         ],
     )