Merge branch 'master' into develop

2012-12-03 12:42:53 -08:00 · 2012-12-03 12:42:53 -08:00 · 6f8a4f8354
commit 6f8a4f8354
parent e25a49f804 def34f0e42
1 changed files with 1 additions and 1 deletions
--- a/sleekxmpp/features/feature_mechanisms/mechanisms.py
+++ b/sleekxmpp/features/feature_mechanisms/mechanisms.py
@ -98,7 +98,7 @@ class FeatureMechanisms(BasePlugin):
                jid = self.xmpp.requested_jid.bare
                result[value] = creds.get('email', jid)
            elif value == 'channel_binding':
-                if sys.version_info >= (3, 3):
+                if hasattr(self.xmpp.socket, 'get_channel_binding'):
                    result[value] = self.xmpp.socket.get_channel_binding()
                else:
                    result[value] = None