summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorJoe Hildebrand <joe-github@cursive.net>2012-10-31 12:49:33 -0600
committerJoe Hildebrand <joe-github@cursive.net>2012-10-31 12:49:33 -0600
commit48def71d0c35755d0d34f3be4ebc35a26c12693b (patch)
treed26b36700616356c5668c32d0a5db29f885c0239 /sleekxmpp/plugins
parentc8c20fff71c31cfcaee9cda44b4cfddfd0763cc2 (diff)
parent12e8bb6ddcd686ec9835ba478a112984e65120a1 (diff)
downloadslixmpp-48def71d0c35755d0d34f3be4ebc35a26c12693b.tar.gz
slixmpp-48def71d0c35755d0d34f3be4ebc35a26c12693b.tar.bz2
slixmpp-48def71d0c35755d0d34f3be4ebc35a26c12693b.tar.xz
slixmpp-48def71d0c35755d0d34f3be4ebc35a26c12693b.zip
Merge branch 'master' of git://github.com/fritzy/SleekXMPP into develophildjj-dev
# By Lance Stout # Via Lance Stout * 'master' of git://github.com/fritzy/SleekXMPP: Turns out not all data is UTF-8, so don't try to decode it.
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/xep_0047/stanza.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0047/stanza.py b/sleekxmpp/plugins/xep_0047/stanza.py
index e4a32f87..7e5d2fed 100644
--- a/sleekxmpp/plugins/xep_0047/stanza.py
+++ b/sleekxmpp/plugins/xep_0047/stanza.py
@@ -14,7 +14,7 @@ def to_b64(data):
def from_b64(data):
- return bytes(base64.b64decode(bytes(data))).decode('utf-8')
+ return bytes(base64.b64decode(bytes(data)))
class Open(ElementBase):