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

Revert "In registry.py, test whether a requested configuration variable is a channel name before creating it automatically. Closes GH-63."

Browse Source 
This reverts commit c6facc99f3.

Conflicts:

	src/version.py
This commit is contained in:
Valentin Lorentz 2011-08-12 01:06:31 +02:00
parent 0ec1c6a81e
commit 1fa02674a0
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/Config/test.py
View File

@ -34,7 +34,7 @@ import supybot.conf as conf
class ConfigTestCase(ChannelPluginTestCase): class ConfigTestCase(ChannelPluginTestCase):
# We add utilities so there's something in supybot.plugins. # We add utilities so there's something in supybot.plugins.
plugins = ('Config', 'Utilities', 'AutoMode') plugins = ('Config', 'Utilities')
def testGet(self): def testGet(self):
self.assertNotRegexp('config get supybot.reply', r'registry\.Group') self.assertNotRegexp('config get supybot.reply', r'registry\.Group')
self.assertResponse('config supybot.protocols.irc.throttleTime', '0.0') self.assertResponse('config supybot.protocols.irc.throttleTime', '0.0')
@ -49,9 +49,6 @@ class ConfigTestCase(ChannelPluginTestCase):
def testHelp(self): def testHelp(self):
self.assertError('config help alsdkfj') self.assertError('config help alsdkfj')
self.assertError('config help supybot.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') # We tell the user to list.
self.assertNotError('config help supybot.plugins') self.assertNotError('config help supybot.plugins')
self.assertNotError('config help supybot.replies.success') self.assertNotError('config help supybot.replies.success')

2
src/registry.py
View File

@ -206,7 +206,7 @@ class Group(object):
def __getattr__(self, attr): def __getattr__(self, attr):
if attr in self._children: if attr in self._children:
return self._children[attr] return self._children[attr]
elif self._supplyDefault and attr.startswith('#'): elif self._supplyDefault:
return self.__makeChild(attr, str(self)) return self.__makeChild(attr, str(self))
else: else:
self.__nonExistentEntry(attr) self.__nonExistentEntry(attr)