Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop

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 = {}