Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-23 02:49:27 +01:00
Code Issues Projects Releases Wiki Activity

RSS: Remove local/feedparser and add it to install_requires

Browse Source 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
This commit is contained in:
James McCoy 2012-10-14 10:41:56 -04:00
parent 450be69710
commit aa4071fa68
5 changed files with 2 additions and 2869 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/RSS/local/__init__.py
View File

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

2858
plugins/RSS/local/feedparser.py
View File

File diff suppressed because it is too large Load Diff

8
plugins/RSS/plugin.py
View File

@ -33,6 +33,7 @@ import time
import socket import socket
import sgmllib import sgmllib
import threading import threading
import feedparser
import supybot.conf as conf import supybot.conf as conf
import supybot.utils as utils import supybot.utils as utils
@ -42,13 +43,6 @@ import supybot.ircutils as ircutils
import supybot.registry as registry import supybot.registry as registry
import supybot.callbacks as callbacks 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): def getFeedName(irc, msg, args, state):
if not registry.isValidRegistryName(args[0]): if not registry.isValidRegistryName(args[0]):
state.errorInvalid('feed name', args[0], state.errorInvalid('feed name', args[0],

1
plugins/RSS/test.py
View File

@ -77,7 +77,6 @@ class RSSTestCase(ChannelPluginTestCase):
def testNonAsciiFeeds(self): def testNonAsciiFeeds(self):
self.assertNotError('rss http://www.heise.de/newsticker/heise.rdf') 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') self.assertNotError('rss info http://br-linux.org/main/index.xml')

3
setup.py
View File

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