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

Fix for bug #829300

Browse Source
This commit is contained in:
Jeremy Fincher 2003-10-24 09:03:34 +00:00
parent d54ec97253
commit 300004ca62
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Owner.py
View File

@ -72,6 +72,7 @@ def loadPluginModule(name):
def loadPluginClass(irc, module): def loadPluginClass(irc, module):
"""Loads the plugin Class from the given module into the given irc.""" """Loads the plugin Class from the given module into the given irc."""
callback = module.Class() callback = module.Class()
assert not irc.getCallback(callback.name())
irc.addCallback(callback) irc.addCallback(callback)
if hasattr(callback, 'configure'): if hasattr(callback, 'configure'):
callback.configure(irc) callback.configure(irc)
@ -285,10 +286,9 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
the end. the end.
""" """
name = privmsgs.getArgs(args) name = privmsgs.getArgs(args)
for cb in irc.callbacks: if irc.getCallback(name):
if cb.name() == name: irc.error(msg, 'That module is already loaded.')
irc.error(msg, 'That module is already loaded.') return
return
try: try:
module = loadPluginModule(name) module = loadPluginModule(name)
except ImportError, e: except ImportError, e:

1
test/test_Owner.py
View File

@ -83,6 +83,7 @@ class OwnerTestCase(PluginTestCase, PluginDocumentation):
def testLoad(self): def testLoad(self):
self.assertError('load Owner') self.assertError('load Owner')
self.assertError('load owner')
self.assertNotError('load Misc') self.assertNotError('load Misc')
self.assertNotError('list Owner') self.assertNotError('list Owner')