Merge pull request #690 from Mkaysi/patch-1

src/conf.py: set default banmask to host.
This commit is contained in:
Valentin Lorentz 2014-05-29 00:27:10 +02:00
commit 07f3392a8c
2 changed files with 2 additions and 2 deletions

View File

@ -228,7 +228,7 @@ class ChannelTestCase(ChannelPluginTestCase):
self.assertResponse('channel ignore list', "'%s'" % expect)
self.assertNotError('channel ignore remove %s' % expect)
self.assertRegexp('channel ignore list', 'not currently')
ignore('foo!bar@baz', '*!bar@baz')
ignore('foo!bar@baz', '*!*@baz')
ignore('foo!*@*')
with conf.supybot.protocols.irc.banmask.context(['exact']):
ignore('foo!bar@baz')

View File

@ -1054,7 +1054,7 @@ class Banmask(registry.SpaceSeparatedSetOfStrings):
return ircutils.joinHostmask(bnick, buser, bhost)
registerChannelValue(supybot.protocols.irc, 'banmask',
Banmask(['user', 'host'], _("""Determines what will be used as the
Banmask(['host'], _("""Determines what will be used as the
default banmask style.""")))
registerGlobalValue(supybot.protocols.irc, 'strictRfc',