Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-18 08:02:49 +01:00
Code Issues Projects Releases Wiki Activity

Fix commit c310d74a19 (no more 'Error: error' message on 'Missing capability' error).

Browse Source
This commit is contained in:
Valentin Lorentz 2012-06-09 18:54:10 +02:00
parent 9723e14a4d
commit 857632c762
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/callbacks.py
View File

@ -251,6 +251,10 @@ class ArgumentError(Error):
"""The bot replies with a help message when this is raised.""" """The bot replies with a help message when this is raised."""
pass pass
class SilentError(Error):
"""An error that we should not notify the user."""
pass
class Tokenizer(object): class Tokenizer(object):
# This will be used as a global environment to evaluate strings in. # This will be used as a global environment to evaluate strings in.
# Evaluation is, of course, necessary in order to allow escaped # Evaluation is, of course, necessary in order to allow escaped
@ -478,7 +482,7 @@ class RichReplyMethods(object):
else: else:
log.debug('Not sending capability error, ' log.debug('Not sending capability error, '
'supybot.reply.error.noCapability is False.') 'supybot.reply.error.noCapability is False.')
raise Error, 'error' raise SilentError
else: else:
log.warning('Denying %s for some unspecified capability ' log.warning('Denying %s for some unspecified capability '
'(or a default).', self.msg.prefix) '(or a default).', self.msg.prefix)
@ -1217,6 +1221,8 @@ class Commands(BasePlugin):
self.callCommand(command, irc, msg, *args, **kwargs) self.callCommand(command, irc, msg, *args, **kwargs)
finally: finally:
self.callingCommand = None self.callingCommand = None
except SilentError:
pass
except (getopt.GetoptError, ArgumentError), e: except (getopt.GetoptError, ArgumentError), e:
self.log.debug('Got %s, giving argument error.', self.log.debug('Got %s, giving argument error.',
utils.exnToString(e)) utils.exnToString(e))