changeset 5e9496f6ab87 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=5e9496f6ab87 description: fix xhtml

diffstat:

src/conversation_textview.py | 2 +- src/htmltextview.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 3e9c81e39c0e -r 5e9496f6ab87 src/conversation_textview.py --- a/src/conversation_textview.py Sun Jan 06 03:57:53 2013 +0400 +++ b/src/conversation_textview.py Sun Jan 06 12:35:10 2013 +0400 @@ -1363,7 +1363,7 @@ try: if name and (text.startswith('/me ') or text.startswith('/me\n')): xhtml = xhtml.replace('/me', '<i>* %s</i>' % (name,), 1) - self.tv.display_html(xhtml.encode('utf-8'), self) + self.tv.display_html(xhtml, self) return except Exception as e: gajim.log.debug('Error processing xhtml' + str(e)) diff -r 3e9c81e39c0e -r 5e9496f6ab87 src/htmltextview.py --- a/src/htmltextview.py Sun Jan 06 03:57:53 2013 +0400 +++ b/src/htmltextview.py Sun Jan 06 12:35:10 2013 +0400 @@ -525,7 +525,8 @@ # The "data" URL scheme http://tools.ietf.org/html/rfc2397 import base64 img = attrs['src'].split(',')[1] - mem = base64.standard_b64decode(urllib.parse.unquote(img)) + mem = base64.standard_b64decode(urllib.parse.unquote( + img).encode('utf-8')) elif loaded is not None: (mem, alt, replace_mark) = loaded update = True