Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-24 19:52:54 +01:00
Code Issues Projects Releases Wiki Activity

Tweaked some methods to fix some bugs (yes, it's ambiguous, I know).

Browse Source
This commit is contained in:
Jeremy Fincher 2005-02-18 06:13:47 +00:00
parent 0e86d75ed7
commit ed0b91c3df
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/callbacks.py
View File

@ -624,6 +624,7 @@ class IrcObjectProxy(RichReplyMethods):
maxL = [] maxL = []
for cb in self.irc.callbacks: for cb in self.irc.callbacks:
L = cb.getCommand(args) L = cb.getCommand(args)
log.debug('%s.getCommand(%r) returned %r', cb.name(), args, L)
if L and L >= maxL: if L and L >= maxL:
maxL = L maxL = L
cbs.append((cb, L)) cbs.append((cb, L))
@ -995,7 +996,7 @@ class Commands(object):
first = canonicalName(args[0]) first = canonicalName(args[0])
if len(args) >= 2 and first == self.canonicalName(): if len(args) >= 2 and first == self.canonicalName():
second = canonicalName(args[1]) second = canonicalName(args[1])
if self.isCommandMethod(second): if second != self.canonicalName() and self.isCommandMethod(second):
return args[:2] return args[:2]
if self.isCommandMethod(first): if self.isCommandMethod(first):
return args[:1] return args[:1]
@ -1003,14 +1004,13 @@ class Commands(object):
def getCommandMethod(self, command): def getCommandMethod(self, command):
"""Gets the given command from this plugin.""" """Gets the given command from this plugin."""
self.log.debug('*** command: %s', str(command))
command = map(canonicalName, command) command = map(canonicalName, command)
try: assert self.getCommand(command) == command
return getattr(self, command[0]) if len(command) == 2:
except AttributeError:
assert command[0] == self.canonicalName() assert command[0] == self.canonicalName()
assert len(command) >= 2 return self.getCommandMethod([command[1]])
return getattr(self, command[1]) else:
return getattr(self, command[0])
def listCommands(self): def listCommands(self):
commands = [] commands = []
@ -1037,7 +1037,10 @@ class Commands(object):
self.callCommand(command, irc, msg, *args, **kwargs) self.callCommand(command, irc, msg, *args, **kwargs)
finally: finally:
self.callingCommand = None self.callingCommand = None
except (getopt.GetoptError, ArgumentError): except (getopt.GetoptError, ArgumentError), e:
self.log.debug('Got %s, giving argument error.',
utils.exnToString(e))
self.log.exception('Wow, really difficulties here:')
method = self.getCommandMethod(command) method = self.getCommandMethod(command)
irc.reply(formatArgumentError(method, name=formatCommand(command))) irc.reply(formatArgumentError(method, name=formatCommand(command)))
except (SyntaxError, Error), e: except (SyntaxError, Error), e: