Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed a possible bug in the ArgumentError handler and replaced my SyntaxError(Error) stupidity.

This commit is contained in:
Jeremy Fincher 2003-08-17 06:24:17 +00:00
parent 44d4c98dc7
commit 00290faca9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/callbacks.py
View File

@ -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()