jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hotfix for ANONYMOUS mech support.

Browse Source 
Updates version to 1.0-Beta6.1
This commit is contained in:
Lance Stout 2011-08-05 14:06:58 -07:00
parent 168203c94d
commit 148a23579c
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
setup.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Copyright (C) 2007-2008 Nathanael C. Fritz # Copyright (C) 2007-2011 Nathanael C. Fritz
# All Rights Reserved # All Rights Reserved
# #
# This software is licensed as described in the README file, # This software is licensed as described in the README file,
@ -29,13 +29,16 @@ import sleekxmpp
VERSION = sleekxmpp.__version__ VERSION = sleekxmpp.__version__
DESCRIPTION = 'SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc).' DESCRIPTION = 'SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc).'
LONG_DESCRIPTION = """ with open('README') as readme:
SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc). LONG_DESCRIPTION = '\n'.join(readme)
"""
CLASSIFIERS = [ 'Intended Audience :: Developers', CLASSIFIERS = [ 'Intended Audience :: Developers',
'License :: OSI Approved :: MIT', 'License :: OSI Approved :: MIT License',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python 2.6',
'Programming Language :: Python 2.7',
'Programming Language :: Python 3.1',
'Programming Language :: Python 3.2',
'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: Software Development :: Libraries :: Python Modules',
] ]
@ -82,7 +85,7 @@ setup(
long_description = LONG_DESCRIPTION, long_description = LONG_DESCRIPTION,
author = 'Nathanael Fritz', author = 'Nathanael Fritz',
author_email = 'fritzy [at] netflint.net', author_email = 'fritzy [at] netflint.net',
url = 'http://code.google.com/p/sleekxmpp', url = 'http://github.com/fritzy/SleekXMPP',
license = 'MIT', license = 'MIT',
platforms = [ 'any' ], platforms = [ 'any' ],
packages = packages, packages = packages,

4
sleekxmpp/__init__.py
View File

@ -15,5 +15,5 @@ from sleekxmpp.xmlstream import XMLStream, RestartStream
from sleekxmpp.xmlstream.matcher import * from sleekxmpp.xmlstream.matcher import *
from sleekxmpp.xmlstream.stanzabase import StanzaBase, ET from sleekxmpp.xmlstream.stanzabase import StanzaBase, ET
__version__ = '1.0beta6' __version__ = '1.0beta6.1'
__version_info__ = (1, 0, 0, 'beta6', 0) __version_info__ = (1, 0, 0, 'beta6', 1)

2
sleekxmpp/thirdparty/suelta/mechanisms/anonymous.py vendored
View File

@ -10,7 +10,7 @@ class ANONYMOUS(Mechanism):
def __init__(self, sasl, name): def __init__(self, sasl, name):
""" """
""" """
super(ANONYMOUS, self).__init__(self, sasl, name, 0) super(ANONYMOUS, self).__init__(sasl, name, 0)
def get_values(self): def get_values(self):
""" """

4
sleekxmpp/thirdparty/suelta/sasl.py vendored
View File

@ -225,7 +225,7 @@ class SASL(object):
requested_mech = 'ANONYMOUS' requested_mech = 'ANONYMOUS'
else: else:
requested_mech = self.mech requested_mech = self.mech
if requested_mech == '*' and self.user == 'anonymous': if requested_mech == '*' and self.user in ['', 'anonymous', None]:
requested_mech = 'ANONYMOUS' requested_mech = 'ANONYMOUS'
# If a specific mechanism was requested, try it # If a specific mechanism was requested, try it
@ -243,7 +243,7 @@ class SASL(object):
if MECH_SEC_SCORES[name] > best_score: if MECH_SEC_SCORES[name] > best_score:
best_score = MECH_SEC_SCORES[name] best_score = MECH_SEC_SCORES[name]
best_mech = name best_mech = name
if best_mech != None: if best_mech is not None:
best_mech = MECHANISMS[best_mech](self, best_mech) best_mech = MECHANISMS[best_mech](self, best_mech)
return best_mech return best_mech