summaryrefslogtreecommitdiff
path: root/sleekxmpp/util
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-08-10 14:15:55 -0700
committerLance Stout <lancestout@gmail.com>2012-08-10 14:15:55 -0700
commit962dfad2166574955c7be6d12c930991b0f29403 (patch)
tree6a4dd01bd7668bb133814d0e099fed38ef7d08d7 /sleekxmpp/util
parent14aa8311690f3a58ff4b7ad286bcccdd867789f7 (diff)
parentf7a710e55bf433a378dee4bd05f6ceb59f2e9e2d (diff)
downloadslixmpp-962dfad2166574955c7be6d12c930991b0f29403.tar.gz
slixmpp-962dfad2166574955c7be6d12c930991b0f29403.tar.bz2
slixmpp-962dfad2166574955c7be6d12c930991b0f29403.tar.xz
slixmpp-962dfad2166574955c7be6d12c930991b0f29403.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/util')
-rw-r--r--sleekxmpp/util/misc_ops.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/sleekxmpp/util/misc_ops.py b/sleekxmpp/util/misc_ops.py
index 1dcc2b91..9bb1db4b 100644
--- a/sleekxmpp/util/misc_ops.py
+++ b/sleekxmpp/util/misc_ops.py
@@ -4,6 +4,8 @@ import hashlib
def unicode(text):
if sys.version_info < (3, 0):
+ if isinstance(text, str):
+ text = text.decode('utf-8')
import __builtin__
return __builtin__.unicode(text)
return str(text)