Merge remote-tracking branch 'progval/testing' into HEAD

This commit is contained in:
Mika Suomalainen 2011-06-29 16:54:19 +03:00
commit 02568e50d1

View File

@ -540,11 +540,11 @@ class Owner(callbacks.Plugin):
if plugin.isCommand(command):
pluginCommand = '%s.%s' % (plugin.name(), command)
conf.supybot.commands.disabled().add(pluginCommand)
plugin._disabled.add(command)
else:
irc.error('%s is not a command in the %s plugin.' %
(command, plugin.name()))
return
self._disabled.add(pluginCommand, plugin.name())
else:
conf.supybot.commands.disabled().add(command)
self._disabled.add(command)
@ -560,8 +560,8 @@ class Owner(callbacks.Plugin):
"""
try:
if plugin:
plugin._disabled.remove(command, plugin.name())
command = '%s.%s' % (plugin.name(), command)
self._disabled.remove(command, plugin.name())
else:
self._disabled.remove(command)
conf.supybot.commands.disabled().remove(command)