pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

XHTML-IM: Check for the existence of elements manually.

Browse source 
This fixes part of #3186, slixmpp was previously adding a new XHTML-IM
payload whenever we just wanted to check for its presence.  Also makes
the code abort faster in the common case where no XHTML-IM element is
present.
This commit is contained in:
Emmanuel Gil Peyrot 2016-11-26 17:57:51 +00:00
parent c8b2d2650f
commit efc2ebe2c4
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
poezio/xhtml.py
View file

@ -195,15 +195,18 @@ def get_body_from_message_stanza(message, use_xhtml=False,
poezio colors if there's an xhtml_im element, or
the body (without any color) otherwise
"""
if use_xhtml:
xhtml = message['html'].xml
xhtml_body = xhtml.find('{http://www.w3.org/1999/xhtml}body')
if xhtml_body:
content = xhtml_to_poezio_colors(xhtml_body, tmp_dir=tmp_dir,
extract_images=extract_images)
content = content if content else message['body']
return content or " "
return message['body']
if not use_xhtml:
return message['body']
xhtml = message.xml.find('{http://jabber.org/protocol/xhtml-im}html')
if not xhtml:
return message['body']
xhtml_body = xhtml.find('{http://www.w3.org/1999/xhtml}body')
if not xhtml_body:
return message['body']
content = xhtml_to_poezio_colors(xhtml_body, tmp_dir=tmp_dir,
extract_images=extract_images)
content = content if content else message['body']
return content or " "
def ncurses_color_to_html(color):
"""