summaryrefslogtreecommitdiff
path: root/sleekxmpp/thirdparty/suelta/sasl.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-08-05 14:06:58 -0700
committerLance Stout <lancestout@gmail.com>2011-08-05 14:06:58 -0700
commit148a23579c199d218325c88d7b6f567f42c7a36a (patch)
tree82c9d0b3d4b54ad5e5016a954bc35b4d2c72ec9f /sleekxmpp/thirdparty/suelta/sasl.py
parent168203c94def5b4f88345e2564ecb0b973e8fc3f (diff)
downloadslixmpp-148a23579c199d218325c88d7b6f567f42c7a36a.tar.gz
slixmpp-148a23579c199d218325c88d7b6f567f42c7a36a.tar.bz2
slixmpp-148a23579c199d218325c88d7b6f567f42c7a36a.tar.xz
slixmpp-148a23579c199d218325c88d7b6f567f42c7a36a.zip
Hotfix for ANONYMOUS mech support.sleek-1.0-Beta6.11.0-Beta6.1
Updates version to 1.0-Beta6.1
Diffstat (limited to 'sleekxmpp/thirdparty/suelta/sasl.py')
-rw-r--r--sleekxmpp/thirdparty/suelta/sasl.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/thirdparty/suelta/sasl.py b/sleekxmpp/thirdparty/suelta/sasl.py
index ec7afe9d..2ae9ae61 100644
--- a/sleekxmpp/thirdparty/suelta/sasl.py
+++ b/sleekxmpp/thirdparty/suelta/sasl.py
@@ -225,7 +225,7 @@ class SASL(object):
requested_mech = 'ANONYMOUS'
else:
requested_mech = self.mech
- if requested_mech == '*' and self.user == 'anonymous':
+ if requested_mech == '*' and self.user in ['', 'anonymous', None]:
requested_mech = 'ANONYMOUS'
# If a specific mechanism was requested, try it
@@ -243,7 +243,7 @@ class SASL(object):
if MECH_SEC_SCORES[name] > best_score:
best_score = MECH_SEC_SCORES[name]
best_mech = name
- if best_mech != None:
+ if best_mech is not None:
best_mech = MECHANISMS[best_mech](self, best_mech)
return best_mech