Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-02 23:54:07 +01:00
Code Issues Projects Releases Wiki Activity

Put a band-aid on our "not catching InvalidRegistryName" problem. This

Browse Source 
should be further investigated since callCommand should be doing the catching.
This commit is contained in:
James Vega 2004-09-09 16:25:53 +00:00
parent daca76bfc8
commit c84c47e8fb
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Config.py
View File

@ -98,6 +98,9 @@ if os.name == 'posix':
class Config(callbacks.Privmsg): class Config(callbacks.Privmsg):
def callCommand(self, name, irc, msg, *L, **kwargs): def callCommand(self, name, irc, msg, *L, **kwargs):
#XXX For some reason, that confuses jamessan, InvalidRegistryName
# is not really being caught here, but it is caught if we
# attempt to catch it in the individual command methods.
try: try:
super(Config, self).callCommand(name, irc, msg, *L, **kwargs) super(Config, self).callCommand(name, irc, msg, *L, **kwargs)
except InvalidRegistryName, e: except InvalidRegistryName, e:
@ -122,7 +125,7 @@ class Config(callbacks.Privmsg):
L.append(vname) L.append(vname)
utils.sortBy(str.lower, L) utils.sortBy(str.lower, L)
return L return L
def list(self, irc, msg, args): def list(self, irc, msg, args):
"""<group> """<group>
@ -130,7 +133,10 @@ class Config(callbacks.Privmsg):
configuration <group>. Subgroups are indicated by a preceding @. configuration <group>. Subgroups are indicated by a preceding @.
""" """
name = privmsgs.getArgs(args) name = privmsgs.getArgs(args)
L = self._list(name) try:
L = self._list(name)
except InvalidRegistryName, e:
irc.errorInvalid('configuration variable', e.args[0])
if L: if L:
irc.reply(utils.commaAndify(L)) irc.reply(utils.commaAndify(L))
else: else:
@ -161,10 +167,13 @@ class Config(callbacks.Privmsg):
returns the current value of <name>. You may omit the leading returns the current value of <name>. You may omit the leading
"supybot." in the name if you so choose. "supybot." in the name if you so choose.
""" """
if len(args) >= 2: try:
self._set(irc, msg, args) if len(args) >= 2:
else: self._set(irc, msg, args)
self._get(irc, msg, args) else:
self._get(irc, msg, args)
except InvalidRegistryName, e:
irc.errorInvalid('configuration variable', e.args[0])
def channel(self, irc, msg, args): def channel(self, irc, msg, args):
"""[<channel>] <name> [<value>] """[<channel>] <name> [<value>]
@ -177,7 +186,10 @@ class Config(callbacks.Privmsg):
if not args: if not args:
raise callbacks.ArgumentError raise callbacks.ArgumentError
args[0] = self._canonicalizeName(args[0]) args[0] = self._canonicalizeName(args[0])
wrapper = getWrapper(args[0]) try:
wrapper = getWrapper(args[0])
except InvalidRegistryName, e:
irc.errorInvalid('configuration variable', e.args[0])
if not wrapper.channelValue: if not wrapper.channelValue:
irc.error('That configuration variable is not a channel-specific ' irc.error('That configuration variable is not a channel-specific '
'configuration variable.') 'configuration variable.')
@ -231,7 +243,10 @@ class Config(callbacks.Privmsg):
""" """
name = privmsgs.getArgs(args) name = privmsgs.getArgs(args)
name = self._canonicalizeName(name) name = self._canonicalizeName(name)
wrapper = getWrapper(name) try:
wrapper = getWrapper(name)
except InvalidRegistryName, e:
irc.errorInvalid('configuration variable', e.args[0])
if hasattr(wrapper, 'help'): if hasattr(wrapper, 'help'):
s = wrapper.help s = wrapper.help
if not wrapper._private: if not wrapper._private:
@ -247,7 +262,10 @@ class Config(callbacks.Privmsg):
""" """
name = privmsgs.getArgs(args) name = privmsgs.getArgs(args)
name = self._canonicalizeName(name) name = self._canonicalizeName(name)
wrapper = getWrapper(name) try:
wrapper = getWrapper(name)
except InvalidRegistryName, e:
irc.errorInvalid('configuration variable', e.args[0])
v = wrapper.__class__(wrapper._default, '') v = wrapper.__class__(wrapper._default, '')
irc.reply(str(v)) irc.reply(str(v))
@ -260,7 +278,7 @@ class Config(callbacks.Privmsg):
_reload() # This was factored out for SIGHUP handling. _reload() # This was factored out for SIGHUP handling.
irc.replySuccess() irc.replySuccess()
reload = privmsgs.checkCapability(reload, 'owner') reload = privmsgs.checkCapability(reload, 'owner')
Class = Config Class = Config