conf.py: Change username to sasl_username and add it as last argument.

This commit is contained in:
nyuszika7h 2011-09-13 19:55:31 +02:00
parent ca502c6814
commit e140fc76f5

View File

@ -258,7 +258,7 @@ class SpaceSeparatedSetOfChannels(registry.SpaceSeparatedListOf):
else: else:
return ircmsgs.join(channel) return ircmsgs.join(channel)
def registerNetwork(name, username='', password='', ssl=False): def registerNetwork(name, password='', ssl=False, sasl_username = ''):
network = registerGroup(supybot.networks, name) network = registerGroup(supybot.networks, name)
registerGlobalValue(network, 'password', registry.String(password, registerGlobalValue(network, 'password', registry.String(password,
_("""Determines what password will be used on %s. Yes, we know that _("""Determines what password will be used on %s. Yes, we know that
@ -278,7 +278,7 @@ def registerNetwork(name, username='', password='', ssl=False):
_("""Determines what key (if any) will be used to join the _("""Determines what key (if any) will be used to join the
channel."""))) channel.""")))
sasl = registerGroup(network, 'sasl') sasl = registerGroup(network, 'sasl')
registerGlobalValue(sasl, 'username', registry.String(username, registerGlobalValue(sasl, 'username', registry.String(sasl_username,
_("""Determines what SASL username will be used on %s. This should _("""Determines what SASL username will be used on %s. This should
be the bot's account name. Due to the way SASL works, you can't use be the bot's account name. Due to the way SASL works, you can't use
any grouped nick.""") % name, private=False)) any grouped nick.""") % name, private=False))