summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-11-09 09:58:51 -0800
committerLance Stout <lancestout@gmail.com>2012-11-09 09:58:51 -0800
commit2d066c34fd58882901fea0d82c34ad37e312cd27 (patch)
tree49cdd208e61379d984357e9e8340d9344525ab4d
parent1b449585f7bd490c2b788ef962fece5c0ae7226b (diff)
parent7a1ed64985a7cbfe48e834838d30e202f1c692e4 (diff)
downloadslixmpp-2d066c34fd58882901fea0d82c34ad37e312cd27.tar.gz
slixmpp-2d066c34fd58882901fea0d82c34ad37e312cd27.tar.bz2
slixmpp-2d066c34fd58882901fea0d82c34ad37e312cd27.tar.xz
slixmpp-2d066c34fd58882901fea0d82c34ad37e312cd27.zip
Merge branch 'master' into develop
-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):