Allow an implicit supybot.

This commit is contained in:
Jeremy Fincher 2004-02-02 08:33:03 +00:00
parent c0ea69ef0f
commit b9e611fd91
2 changed files with 11 additions and 0 deletions

View File

@ -87,6 +87,11 @@ class Config(callbacks.Privmsg):
except registry.InvalidRegistryValue, e: except registry.InvalidRegistryValue, e:
irc.error(str(e)) irc.error(str(e))
def _canonicalizeName(self, name):
if not name.startswith('supybot.'):
name = 'supybot.' + name
return name
def list(self, irc, msg, args): def list(self, irc, msg, args):
"""[--groups] <group> """[--groups] <group>
@ -100,6 +105,7 @@ class Config(callbacks.Privmsg):
if name == '--groups': if name == '--groups':
groups = True groups = True
name = privmsgs.getArgs(rest) name = privmsgs.getArgs(rest)
name = self._canonicalizeName(name)
group = getWrapper(name) group = getWrapper(name)
if groups: if groups:
L = group.children.keys() L = group.children.keys()
@ -151,6 +157,7 @@ class Config(callbacks.Privmsg):
Shows the current value of the configuration variable <name>. Shows the current value of the configuration variable <name>.
""" """
name = privmsgs.getArgs(args) name = privmsgs.getArgs(args)
name = self._canonicalizeName(name)
wrapper = getWrapper(name) wrapper = getWrapper(name)
if wrapper.__class__ is registry.Group: if wrapper.__class__ is registry.Group:
irc.error(msg, 'That\'s not a value, it\'s a group. Use the list ' irc.error(msg, 'That\'s not a value, it\'s a group. Use the list '
@ -165,6 +172,7 @@ class Config(callbacks.Privmsg):
Sets the current value of the configuration variable <name> to <value>. Sets the current value of the configuration variable <name> to <value>.
""" """
(name, value) = privmsgs.getArgs(args, required=2) (name, value) = privmsgs.getArgs(args, required=2)
name = self._canonicalizeName(name)
capability = getCapability(name) capability = getCapability(name)
if ircdb.checkCapability(msg.prefix, capability): if ircdb.checkCapability(msg.prefix, capability):
wrapper = getWrapper(name) wrapper = getWrapper(name)
@ -179,6 +187,7 @@ class Config(callbacks.Privmsg):
Returns the description of the configuration variable <name>. Returns the description of the configuration variable <name>.
""" """
name = privmsgs.getArgs(args) name = privmsgs.getArgs(args)
name = self._canonicalizeName(name)
wrapper = getWrapper(name) wrapper = getWrapper(name)
if wrapper.help: if wrapper.help:
irc.reply(wrapper.help) irc.reply(wrapper.help)
@ -191,6 +200,7 @@ class Config(callbacks.Privmsg):
Returns the default value of the configuration variable <name>. Returns the default value of the configuration variable <name>.
""" """
name = privmsgs.getArgs(args) name = privmsgs.getArgs(args)
name = self._canonicalizeName(name)
wrapper = getWrapper(name) wrapper = getWrapper(name)
irc.reply(wrapper.default) irc.reply(wrapper.default)

View File

@ -50,6 +50,7 @@ class ConfigTestCase(ChannelPluginTestCase):
self.assertError('config help supybot.plugins') self.assertError('config help supybot.plugins')
self.assertError('config help supybot.alsdkfj') self.assertError('config help supybot.alsdkfj')
self.assertNotError('config help supybot.replies.success') self.assertNotError('config help supybot.replies.success')
self.assertNotError('config help replies.success')
def testHelpDoesNotAssertionError(self): def testHelpDoesNotAssertionError(self):
self.assertNotRegexp('config help ' # Cont'd. self.assertNotRegexp('config help ' # Cont'd.