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-12-18 10:33:33 -08:00
commit 29c049612a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sleekxmpp/util/misc_ops.py
View File

@ -8,7 +8,10 @@ def unicode(text):
text = text.decode('utf-8') text = text.decode('utf-8')
import __builtin__ import __builtin__
return __builtin__.unicode(text) return __builtin__.unicode(text)
return str(text) elif not isinstance(text, str):
return text.decode('utf-8')
else:
return text
def bytes(text): def bytes(text):