summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-03-31 02:22:53 +0200
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-03-31 02:22:53 +0200
commitc1562b76b273cc7aeaaa1cf8fddd3dca2c828c4d (patch)
tree0f5eaa05187ae1874d14872efdf4b7e3878b7a2a
parent32839f52524bec848893204a4f58337a820e6faf (diff)
downloadslixmpp-c1562b76b273cc7aeaaa1cf8fddd3dca2c828c4d.tar.gz
slixmpp-c1562b76b273cc7aeaaa1cf8fddd3dca2c828c4d.tar.bz2
slixmpp-c1562b76b273cc7aeaaa1cf8fddd3dca2c828c4d.tar.xz
slixmpp-c1562b76b273cc7aeaaa1cf8fddd3dca2c828c4d.zip
slixmpp is Python 3.4.4+, remove check for channel binding.
-rw-r--r--slixmpp/features/feature_mechanisms/mechanisms.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/slixmpp/features/feature_mechanisms/mechanisms.py b/slixmpp/features/feature_mechanisms/mechanisms.py
index 33bdaff5..27877e67 100644
--- a/slixmpp/features/feature_mechanisms/mechanisms.py
+++ b/slixmpp/features/feature_mechanisms/mechanisms.py
@@ -97,13 +97,7 @@ class FeatureMechanisms(BasePlugin):
jid = self.xmpp.requested_jid.bare
result[value] = creds.get('email', jid)
elif value == 'channel_binding':
- if hasattr(self.xmpp.socket, 'get_channel_binding'):
- result[value] = self.xmpp.socket.get_channel_binding()
- else:
- log.debug("Channel binding not supported.")
- log.debug("Use Python 3.3+ for channel binding and " + \
- "SCRAM-SHA-1-PLUS support")
- result[value] = None
+ result[value] = self.xmpp.socket.get_channel_binding()
elif value == 'host':
result[value] = creds.get('host', self.xmpp.requested_jid.domain)
elif value == 'realm':