From 00290faca99e6ecb1a1867823a0c53430c38fdac Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Sun, 17 Aug 2003 06:24:17 +0000 Subject: [PATCH] Fixed a possible bug in the ArgumentError handler and replaced my SyntaxError(Error) stupidity. --- src/callbacks.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/callbacks.py b/src/callbacks.py index 489111daa..25d3d4267 100644 --- a/src/callbacks.py +++ b/src/callbacks.py @@ -289,8 +289,11 @@ class IrcObjectProxy: self.args.insert(0, name) self.reply(self.msg, '[%s]' % ' '.join(self.args)) except ArgumentError: - self.reply(self.msg, command.__doc__.splitlines()[0]) - except Error, e: + if hasattr(command, '__doc__'): + self.reply(self.msg, command.__doc__.splitlines()[0]) + else: + self.reply(self.msg, 'Invalid arguments.') + except (SyntaxError, Error), e: self.reply(self.msg, debug.exnToString(e)) except Exception, e: debug.recoverableException() @@ -347,7 +350,7 @@ class CommandThread(threading.Thread): (self.commandName, elapsed), 'verbose') except ArgumentError: self.irc.reply(self.msg, self.command.__doc__.splitlines()[0]) - except Error, e: + except (SyntaxError, Error), e: self.irc.reply(self.msg, debug.exnToString(e)) except Exception, e: debug.recoverableException()