summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2014-09-09 08:50:24 -0700
committerLance Stout <lancestout@gmail.com>2014-09-09 08:50:24 -0700
commit403462fdb82fc1b696d42ff74a2e6c1e0fc494b4 (patch)
tree6825c85401a4a5e010e3aad8c1a64fc31afeb06b /sleekxmpp
parentf22d8e67b402f4756a497d8797e1526c2b7682a1 (diff)
parentc9f8ddff6556401ced52a88ae25263384bdec639 (diff)
downloadslixmpp-403462fdb82fc1b696d42ff74a2e6c1e0fc494b4.tar.gz
slixmpp-403462fdb82fc1b696d42ff74a2e6c1e0fc494b4.tar.bz2
slixmpp-403462fdb82fc1b696d42ff74a2e6c1e0fc494b4.tar.xz
slixmpp-403462fdb82fc1b696d42ff74a2e6c1e0fc494b4.zip
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/util/sasl/mechanisms.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/sleekxmpp/util/sasl/mechanisms.py b/sleekxmpp/util/sasl/mechanisms.py
index d341ed3e..7a7ebf7b 100644
--- a/sleekxmpp/util/sasl/mechanisms.py
+++ b/sleekxmpp/util/sasl/mechanisms.py
@@ -223,17 +223,16 @@ class SCRAM(Mech):
return self.hash(text).digest()
def saslname(self, value):
- escaped = b''
- for char in bytes(value):
- if char == b',':
- escaped += b'=2C'
- elif char == b'=':
- escaped += b'=3D'
+ value = value.decode("utf-8")
+ escaped = []
+ for char in value:
+ if char == ',':
+ escaped += '=2C'
+ elif char == '=':
+ escaped += '=3D'
else:
- if isinstance(char, int):
- char = chr(char)
- escaped += bytes(char)
- return escaped
+ escaped += char
+ return "".join(escaped).encode("utf-8")
def parse(self, challenge):
items = {}