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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Lance Stout 2012-08-01 09:05:47 -07:00
commit fb4275648c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleekxmpp/features/feature_mechanisms/mechanisms.py
View File

@ -99,7 +99,7 @@ class FeatureMechanisms(BasePlugin):
result[value] = creds.get('email', jid) result[value] = creds.get('email', jid)
elif value == 'channel_binding': elif value == 'channel_binding':
if sys.version_info >= (3, 3): if sys.version_info >= (3, 3):
result[value] = self.xmpp.socket.channel_binding() result[value] = self.xmpp.socket.get_channel_binding()
else: else:
result[value] = None result[value] = None
elif value == 'host': elif value == 'host':

3
sleekxmpp/util/misc_ops.py
View File

@ -19,6 +19,9 @@ def bytes(text):
:param text: Unicode text to convert to bytes :param text: Unicode text to convert to bytes
:rtype: bytes (Python3), str (Python2.6+) :rtype: bytes (Python3), str (Python2.6+)
""" """
if text is None:
return b''
if sys.version_info < (3, 0): if sys.version_info < (3, 0):
import __builtin__ import __builtin__
return __builtin__.bytes(text) return __builtin__.bytes(text)