From e140fc76f599c9d3636719ffce728c52f9485e6e Mon Sep 17 00:00:00 2001 From: nyuszika7h Date: Tue, 13 Sep 2011 19:55:31 +0200 Subject: [PATCH] conf.py: Change username to sasl_username and add it as last argument. --- src/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf.py b/src/conf.py index d0169b7dc..6dd8692ce 100644 --- a/src/conf.py +++ b/src/conf.py @@ -258,7 +258,7 @@ class SpaceSeparatedSetOfChannels(registry.SpaceSeparatedListOf): else: return ircmsgs.join(channel) -def registerNetwork(name, username='', password='', ssl=False): +def registerNetwork(name, password='', ssl=False, sasl_username = ''): network = registerGroup(supybot.networks, name) registerGlobalValue(network, 'password', registry.String(password, _("""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 channel."""))) 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 be the bot's account name. Due to the way SASL works, you can't use any grouped nick.""") % name, private=False))