summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-12-03 12:42:53 -0800
committerLance Stout <lancestout@gmail.com>2012-12-03 12:42:53 -0800
commit6f8a4f83549ab1716ddca55c05518f3867eb9213 (patch)
tree5238571e13e5e5e6cec6db990ea1523cdcd47197
parente25a49f80444ff36ba1ee91059b4c3d74644d6ff (diff)
parentdef34f0e4296bbba18c243a1ca34c7893763718b (diff)
downloadslixmpp-6f8a4f83549ab1716ddca55c05518f3867eb9213.tar.gz
slixmpp-6f8a4f83549ab1716ddca55c05518f3867eb9213.tar.bz2
slixmpp-6f8a4f83549ab1716ddca55c05518f3867eb9213.tar.xz
slixmpp-6f8a4f83549ab1716ddca55c05518f3867eb9213.zip
Merge branch 'master' into develop
-rw-r--r--sleekxmpp/features/feature_mechanisms/mechanisms.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/features/feature_mechanisms/mechanisms.py b/sleekxmpp/features/feature_mechanisms/mechanisms.py
index 9f3c47f6..555d8fad 100644
--- 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