summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-11-09 09:57:20 -0800
committerLance Stout <lancestout@gmail.com>2012-11-09 09:57:20 -0800
commit7a1ed64985a7cbfe48e834838d30e202f1c692e4 (patch)
tree5894f33e1366e330e867c836ec770c93de2a6c39 /sleekxmpp
parent0fea4262ea396a81926cebc2be39afdbb7129396 (diff)
downloadslixmpp-7a1ed64985a7cbfe48e834838d30e202f1c692e4.tar.gz
slixmpp-7a1ed64985a7cbfe48e834838d30e202f1c692e4.tar.bz2
slixmpp-7a1ed64985a7cbfe48e834838d30e202f1c692e4.tar.xz
slixmpp-7a1ed64985a7cbfe48e834838d30e202f1c692e4.zip
Don't clobber SASL config when specifying sasl_mech in ClientXMPP constructor.
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/clientxmpp.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index 3fa158af..ae3803ef 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/sleekxmpp/clientxmpp.py
@@ -114,8 +114,10 @@ class ClientXMPP(BaseXMPP):
self.register_plugin('feature_session')
self.register_plugin('feature_rosterver')
self.register_plugin('feature_preapproval')
- self.register_plugin('feature_mechanisms',
- pconfig={'use_mech': sasl_mech} if sasl_mech else None)
+ self.register_plugin('feature_mechanisms')
+
+ if sasl_mech:
+ self['feature_mechanisms'].use_mech = sasl_mech
@property
def password(self):