summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorKeith Gray <keith.gray@powereng.com>2014-06-15 18:40:58 -0500
committerKeith Gray <keith.gray@powereng.com>2014-06-15 18:40:58 -0500
commit577fd714724a915d438a232fb1a54379a2a8b96a (patch)
tree4eeccef83ca271b9e40114d377e124d8d4bb9045 /sleekxmpp/plugins
parente5582694c07236e6830c20361840360a1dde37f3 (diff)
downloadslixmpp-577fd714724a915d438a232fb1a54379a2a8b96a.tar.gz
slixmpp-577fd714724a915d438a232fb1a54379a2a8b96a.tar.bz2
slixmpp-577fd714724a915d438a232fb1a54379a2a8b96a.tar.xz
slixmpp-577fd714724a915d438a232fb1a54379a2a8b96a.zip
Fixed a unicode error in xep_0065 on Python 3
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/xep_0065/proxy.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/sleekxmpp/plugins/xep_0065/proxy.py b/sleekxmpp/plugins/xep_0065/proxy.py
index fdd9f97e..d890b57a 100644
--- a/sleekxmpp/plugins/xep_0065/proxy.py
+++ b/sleekxmpp/plugins/xep_0065/proxy.py
@@ -206,7 +206,7 @@ class XEP_0065(base_plugin):
# Though this should not be neccessary remove the closed session anyway
with self._sessions_lock:
if sid in self._sessions:
- log.warn(('SOCKS5 session with sid = "%s" was not ' +
+ log.warn(('SOCKS5 session with sid = "%s" was not ' +
'removed from _sessions by sock.close()') % sid)
del self._sessions[sid]
@@ -240,9 +240,9 @@ class XEP_0065(base_plugin):
# The hostname MUST be SHA1(SID + Requester JID + Target JID)
# where the output is hexadecimal-encoded (not binary).
digest = sha1()
- digest.update(sid)
- digest.update(str(requester))
- digest.update(str(target))
+ digest.update(sid.encode('utf-8'))
+ digest.update(str(requester).encode('utf-8'))
+ digest.update(str(target).encode('utf-8'))
dest = digest.hexdigest()