mirror of https://github.com/Mikaela/Limnoria.git
Correctly report the invalidCommand that set irc.finished.
This commit is contained in:
parent
50d05323d6
commit
846bf9102b
|
@ -527,9 +527,6 @@ class IrcObjectProxy(RichReplyMethods):
|
||||||
log.debug('Calling invalidCommands.')
|
log.debug('Calling invalidCommands.')
|
||||||
for cb in self.irc.callbacks:
|
for cb in self.irc.callbacks:
|
||||||
log.debug('Trying to call %s.invalidCommand.' % cb.name())
|
log.debug('Trying to call %s.invalidCommand.' % cb.name())
|
||||||
if self.finished:
|
|
||||||
log.debug('Finished calling invalidCommand: %s.', cb.name())
|
|
||||||
return
|
|
||||||
if hasattr(cb, 'invalidCommand'):
|
if hasattr(cb, 'invalidCommand'):
|
||||||
try:
|
try:
|
||||||
# I think I took out this try/except block because we
|
# I think I took out this try/except block because we
|
||||||
|
@ -537,6 +534,10 @@ class IrcObjectProxy(RichReplyMethods):
|
||||||
# other classes won't have firewalled it. Better safe
|
# other classes won't have firewalled it. Better safe
|
||||||
# than sorry, I say.
|
# than sorry, I say.
|
||||||
cb.invalidCommand(self, self.msg, self.args)
|
cb.invalidCommand(self, self.msg, self.args)
|
||||||
|
if self.finished:
|
||||||
|
log.debug('Finished calling invalidCommand: %s.',
|
||||||
|
cb.name())
|
||||||
|
return
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
log.exception('Uncaught exception in %s.invalidCommand',
|
log.exception('Uncaught exception in %s.invalidCommand',
|
||||||
cb.name())
|
cb.name())
|
||||||
|
|
Loading…
Reference in New Issue