diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-10-31 00:17:26 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-10-31 00:17:26 -0700 |
| commit | a00eee1bbee83b2435b09be6c4175c3649fa797b (patch) | |
| tree | 42ca01bf2daba33df5077ca04f8b8a9b416698e3 /sleekxmpp/plugins | |
| parent | 06a690a2592cba388877391935ed4168d101a231 (diff) | |
| parent | 12e8bb6ddcd686ec9835ba478a112984e65120a1 (diff) | |
| download | slixmpp-a00eee1bbee83b2435b09be6c4175c3649fa797b.tar.gz slixmpp-a00eee1bbee83b2435b09be6c4175c3649fa797b.tar.bz2 slixmpp-a00eee1bbee83b2435b09be6c4175c3649fa797b.tar.xz slixmpp-a00eee1bbee83b2435b09be6c4175c3649fa797b.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins')
| -rw-r--r-- | sleekxmpp/plugins/xep_0047/stanza.py | 2 |
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): |