3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-25 12:12:53 +01:00

clientbot: rename conf value sasl_mech -> sasl_mechanism

This commit is contained in:
James Lu 2016-12-17 16:00:48 -08:00
parent 0cc1ff8fa3
commit 90e10f948e

View File

@ -416,7 +416,7 @@ class ClientbotWrapperProtocol(Protocol):
log.info("(%s) Skipping SASL auth since the IRCd doesn't support it.", self.irc.name) log.info("(%s) Skipping SASL auth since the IRCd doesn't support it.", self.irc.name)
return return
sasl_mech = self.irc.serverdata.get('sasl_mech') sasl_mech = self.irc.serverdata.get('sasl_mechanism')
if sasl_mech: if sasl_mech:
sasl_user = self.irc.serverdata.get('sasl_username') sasl_user = self.irc.serverdata.get('sasl_username')
sasl_pass = self.irc.serverdata.get('sasl_password') sasl_pass = self.irc.serverdata.get('sasl_password')
@ -455,7 +455,7 @@ class ClientbotWrapperProtocol(Protocol):
if not args: if not args:
return return
if args[0] == '+': if args[0] == '+':
sasl_mech = self.irc.serverdata["sasl_mech"] sasl_mech = self.irc.serverdata['sasl_mechanism']
if sasl_mech == 'PLAIN': if sasl_mech == 'PLAIN':
sasl_user = self.irc.serverdata['sasl_username'].encode('utf-8') sasl_user = self.irc.serverdata['sasl_username'].encode('utf-8')
sasl_pass = self.irc.serverdata['sasl_password'].encode('utf-8') sasl_pass = self.irc.serverdata['sasl_password'].encode('utf-8')