From 148a23579c199d218325c88d7b6f567f42c7a36a Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Fri, 5 Aug 2011 14:06:58 -0700
Subject: Hotfix for ANONYMOUS mech support.

Updates version to 1.0-Beta6.1
---
 setup.py                                            | 15 +++++++++------
 sleekxmpp/__init__.py                               |  4 ++--
 sleekxmpp/thirdparty/suelta/mechanisms/anonymous.py |  2 +-
 sleekxmpp/thirdparty/suelta/sasl.py                 |  4 ++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/setup.py b/setup.py
index 3ccac3af..b997106c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2007-2008 Nathanael C. Fritz
+# Copyright (C) 2007-2011 Nathanael C. Fritz
 # All Rights Reserved
 #
 # This software is licensed as described in the README file,
@@ -29,13 +29,16 @@ import sleekxmpp
 
 VERSION          = sleekxmpp.__version__
 DESCRIPTION      = 'SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc).'
-LONG_DESCRIPTION = """
-SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc).
-"""
+with open('README') as readme:
+    LONG_DESCRIPTION = '\n'.join(readme)
 
 CLASSIFIERS      = [ 'Intended Audience :: Developers',
-                     'License :: OSI Approved :: MIT',
+                     'License :: OSI Approved :: MIT License',
                      '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',
                    ]
 
@@ -82,7 +85,7 @@ setup(
     long_description = LONG_DESCRIPTION,
     author       = 'Nathanael Fritz',
     author_email = 'fritzy [at] netflint.net',
-    url          = 'http://code.google.com/p/sleekxmpp',
+    url          = 'http://github.com/fritzy/SleekXMPP',
     license      = 'MIT',
     platforms    = [ 'any' ],
     packages     = packages,
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
-- 
cgit v1.2.3