From 1fa02674a054dd5d699581cfce101b2c0681cf7f Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Fri, 12 Aug 2011 01:06:31 +0200 Subject: [PATCH] Revert "In registry.py, test whether a requested configuration variable is a channel name before creating it automatically. Closes GH-63." This reverts commit c6facc99f3f929460d9edcf3f3c477728a2e6bb3. Conflicts: src/version.py --- plugins/Config/test.py | 5 +---- src/registry.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/Config/test.py b/plugins/Config/test.py index f59646683..49130b08e 100644 --- a/plugins/Config/test.py +++ b/plugins/Config/test.py @@ -34,7 +34,7 @@ import supybot.conf as conf class ConfigTestCase(ChannelPluginTestCase): # We add utilities so there's something in supybot.plugins. - plugins = ('Config', 'Utilities', 'AutoMode') + plugins = ('Config', 'Utilities') def testGet(self): self.assertNotRegexp('config get supybot.reply', r'registry\.Group') self.assertResponse('config supybot.protocols.irc.throttleTime', '0.0') @@ -49,9 +49,6 @@ class ConfigTestCase(ChannelPluginTestCase): def testHelp(self): self.assertError('config help alsdkfj') self.assertError('config help supybot.alsdkfj') - self.assertNotRegexp('config list supybot', '.*alsdkfj.*') - self.assertError('config help supybot.plugins.AutoMode.ban.alsdkfj') - self.assertNotRegexp('config list supybot.plugins.AutoMode.ban', '.*alsdkfj.*') self.assertNotError('config help supybot') # We tell the user to list. self.assertNotError('config help supybot.plugins') self.assertNotError('config help supybot.replies.success') diff --git a/src/registry.py b/src/registry.py index e8a6c340b..9850ec9b0 100644 --- a/src/registry.py +++ b/src/registry.py @@ -206,7 +206,7 @@ class Group(object): def __getattr__(self, attr): if attr in self._children: return self._children[attr] - elif self._supplyDefault and attr.startswith('#'): + elif self._supplyDefault: return self.__makeChild(attr, str(self)) else: self.__nonExistentEntry(attr)