diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-01-09 22:14:00 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-01-09 22:14:00 -0800 |
| commit | 8644a83ed9fce8e0be746ce92f87b80534a56bf5 (patch) | |
| tree | d4adb5248b8a037152fd9eb3c82a3024a5ca4ca7 /sleekxmpp | |
| parent | f04f4e4a1a67fa3ec49f6badb02cdc062ebef477 (diff) | |
| parent | 7b45245b1dd557b9dea98fdcce96d1f8f2a2771d (diff) | |
| download | slixmpp-8644a83ed9fce8e0be746ce92f87b80534a56bf5.tar.gz slixmpp-8644a83ed9fce8e0be746ce92f87b80534a56bf5.tar.bz2 slixmpp-8644a83ed9fce8e0be746ce92f87b80534a56bf5.tar.xz slixmpp-8644a83ed9fce8e0be746ce92f87b80534a56bf5.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp')
| -rw-r--r-- | sleekxmpp/plugins/xep_0231/stanza.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sleekxmpp/plugins/xep_0231/stanza.py b/sleekxmpp/plugins/xep_0231/stanza.py index a51f5a03..8bf0d6ee 100644 --- a/sleekxmpp/plugins/xep_0231/stanza.py +++ b/sleekxmpp/plugins/xep_0231/stanza.py @@ -7,9 +7,10 @@ See the file LICENSE for copying permission. """ +import base64 -from base64 import b64encode, b64decode +from sleekxmpp.util import bytes from sleekxmpp.xmlstream import ElementBase @@ -26,10 +27,10 @@ class BitsOfBinary(ElementBase): self._set_attr('max-age', value) def get_data(self): - return b64decode(self.xml.text) + return base64.b64decode(bytes(self.xml.text)) def set_data(self, value): - self.xml.text = b64encode(value) + self.xml.text = bytes(base64.b64encode(value)).decode('utf-8') def del_data(self): self.xml.text = '' |