Merge branch 'master' into develop

2012-12-18 10:33:33 -08:00 · 2012-12-18 10:33:33 -08:00 · 29c049612a
commit 29c049612a
parent f431bbfca2 ed48185732
1 changed files with 5 additions and 2 deletions
--- a/sleekxmpp/util/misc_ops.py
+++ b/sleekxmpp/util/misc_ops.py
@ -8,7 +8,10 @@ def unicode(text):
            text = text.decode('utf-8')
        import __builtin__
        return __builtin__.unicode(text)
-    return str(text)
+    elif not isinstance(text, str):
+        return text.decode('utf-8')
+    else:
+        return text


 def bytes(text):