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

Fixed to make the tests run again with the new refactoring.

Browse Source
This commit is contained in:
Jeremy Fincher 2005-02-18 07:31:51 +00:00
parent 3fc1553fc8
commit bd23fd647b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/Alias/plugin.py
View File

@ -197,7 +197,7 @@ class Alias(callbacks.Plugin):
Locks an alias so that no one else can change it. Locks an alias so that no one else can change it.
""" """
if hasattr(self, name) and self.isCommand(name): if hasattr(self, name) and self.isCommandMethod(name):
self.aliases[name][1] = True self.aliases[name][1] = True
conf.supybot.plugins.Alias.aliases.get(name).locked.setValue(True) conf.supybot.plugins.Alias.aliases.get(name).locked.setValue(True)
irc.replySuccess() irc.replySuccess()
@ -210,7 +210,7 @@ class Alias(callbacks.Plugin):
Unlocks an alias so that people can define new aliases over it. Unlocks an alias so that people can define new aliases over it.
""" """
if hasattr(self, name) and self.isCommand(name): if hasattr(self, name) and self.isCommandMethod(name):
self.aliases[name][1] = False self.aliases[name][1] = False
conf.supybot.plugins.Alias.aliases.get(name).locked.setValue(False) conf.supybot.plugins.Alias.aliases.get(name).locked.setValue(False)
irc.replySuccess() irc.replySuccess()
@ -231,9 +231,8 @@ class Alias(callbacks.Plugin):
s = format('That name isn\'t valid. Try %q instead.', realName) s = format('That name isn\'t valid. Try %q instead.', realName)
raise AliasError, s raise AliasError, s
name = realName name = realName
cbs = callbacks.findCallbackForCommand(irc, name) if self.isCommandMethod(name):
if self in cbs: if realName not in self.aliases:
if hasattr(self, realName) and realName not in self.aliases:
s = 'You can\'t overwrite commands in this plugin.' s = 'You can\'t overwrite commands in this plugin.'
raise AliasError, s raise AliasError, s
if name in self.aliases: if name in self.aliases:
@ -256,7 +255,7 @@ class Alias(callbacks.Plugin):
def removeAlias(self, name, evenIfLocked=False): def removeAlias(self, name, evenIfLocked=False):
name = callbacks.canonicalName(name) name = callbacks.canonicalName(name)
if hasattr(self, name) and self.isCommand(name): if hasattr(self, name) and self.isCommandMethod(name):
if evenIfLocked or not self.aliases[name][1]: if evenIfLocked or not self.aliases[name][1]:
delattr(self.__class__, name) delattr(self.__class__, name)
del self.aliases[name] del self.aliases[name]