diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-08-05 14:08:32 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-08-05 14:08:32 -0700 |
| commit | 6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae (patch) | |
| tree | ea302d475b38c694bb147fb3e730ee488b3bf717 /sleekxmpp/thirdparty/suelta/sasl.py | |
| parent | ea95811c4c76ae96bc41c4fab48886dd2e85c7a9 (diff) | |
| parent | 148a23579c199d218325c88d7b6f567f42c7a36a (diff) | |
| download | slixmpp-6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae.tar.gz slixmpp-6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae.tar.bz2 slixmpp-6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae.tar.xz slixmpp-6c4cb2bf00a047dbf5bf9f865c52f7c9703b24ae.zip | |
Merge branch 'master' into develop
Adds hotfix for ANONYMOUS mech support.
Conflicts:
sleekxmpp/__init__.py
Diffstat (limited to 'sleekxmpp/thirdparty/suelta/sasl.py')
| -rw-r--r-- | sleekxmpp/thirdparty/suelta/sasl.py | 4 |
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 |