diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-08-05 14:06:58 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-08-05 14:06:58 -0700 |
| commit | 148a23579c199d218325c88d7b6f567f42c7a36a (patch) | |
| tree | 82c9d0b3d4b54ad5e5016a954bc35b4d2c72ec9f /sleekxmpp | |
| parent | 168203c94def5b4f88345e2564ecb0b973e8fc3f (diff) | |
| download | slixmpp-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')
| -rw-r--r-- | sleekxmpp/__init__.py | 4 | ||||
| -rw-r--r-- | sleekxmpp/thirdparty/suelta/mechanisms/anonymous.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/thirdparty/suelta/sasl.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sleekxmpp/__init__.py b/sleekxmpp/__init__.py index a53cfb0e..aee81ba0 100644 --- a/sleekxmpp/__init__.py +++ b/sleekxmpp/__init__.py @@ -15,5 +15,5 @@ from sleekxmpp.xmlstream import XMLStream, RestartStream from sleekxmpp.xmlstream.matcher import * from sleekxmpp.xmlstream.stanzabase import StanzaBase, ET -__version__ = '1.0beta6' -__version_info__ = (1, 0, 0, 'beta6', 0) +__version__ = '1.0beta6.1' +__version_info__ = (1, 0, 0, 'beta6', 1) diff --git a/sleekxmpp/thirdparty/suelta/mechanisms/anonymous.py b/sleekxmpp/thirdparty/suelta/mechanisms/anonymous.py index de89eef2..e44e91a2 100644 --- a/sleekxmpp/thirdparty/suelta/mechanisms/anonymous.py +++ b/sleekxmpp/thirdparty/suelta/mechanisms/anonymous.py @@ -10,7 +10,7 @@ class ANONYMOUS(Mechanism): def __init__(self, sasl, name): """ """ - super(ANONYMOUS, self).__init__(self, sasl, name, 0) + super(ANONYMOUS, self).__init__(sasl, name, 0) def get_values(self): """ 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 |