From ed0b91c3df2bc86d7d8ad7871aebc12fcb5bbf14 Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Fri, 18 Feb 2005 06:13:47 +0000
Subject: [PATCH] Tweaked some methods to fix some bugs (yes, it's ambiguous, I
 know).

---
 src/callbacks.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/callbacks.py b/src/callbacks.py
index 4e603d07c..8b9ae3b02 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -624,6 +624,7 @@ class IrcObjectProxy(RichReplyMethods):
         maxL = []
         for cb in self.irc.callbacks:
             L = cb.getCommand(args)
+            log.debug('%s.getCommand(%r) returned %r', cb.name(), args, L)
             if L and L >= maxL:
                 maxL = L
                 cbs.append((cb, L))
@@ -995,7 +996,7 @@ class Commands(object):
         first = canonicalName(args[0])
         if len(args) >= 2 and first == self.canonicalName():
             second = canonicalName(args[1])
-            if self.isCommandMethod(second):
+            if second != self.canonicalName() and self.isCommandMethod(second):
                 return args[:2]
         if self.isCommandMethod(first):
             return args[:1]
@@ -1003,14 +1004,13 @@ class Commands(object):
     
     def getCommandMethod(self, command):
         """Gets the given command from this plugin."""
-        self.log.debug('*** command: %s', str(command))
         command = map(canonicalName, command)
-        try:
-            return getattr(self, command[0])
-        except AttributeError:
+        assert self.getCommand(command) == command
+        if len(command) == 2:
             assert command[0] == self.canonicalName()
-            assert len(command) >= 2
-            return getattr(self, command[1])
+            return self.getCommandMethod([command[1]])
+        else:
+            return getattr(self, command[0])
 
     def listCommands(self):
         commands = []
@@ -1037,7 +1037,10 @@ class Commands(object):
                 self.callCommand(command, irc, msg, *args, **kwargs)
             finally:
                 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)
             irc.reply(formatArgumentError(method, name=formatCommand(command)))
         except (SyntaxError, Error), e: