summaryrefslogtreecommitdiff
path: root/sleekxmpp/stanza
diff options
context:
space:
mode:
authorNathan Fritz <nathan@andyet.net>2010-04-07 23:56:44 -0700
committerNathan Fritz <nathan@andyet.net>2010-04-07 23:56:44 -0700
commit2384858f5e6dd7d027b45246bed6085207fca61e (patch)
tree3e76e47d1ef177f41a6bd4f76ca3f1a2aa638b46 /sleekxmpp/stanza
parentdd77d2165d5c3175cc4adda07520d6054ff0c934 (diff)
downloadslixmpp-2384858f5e6dd7d027b45246bed6085207fca61e.tar.gz
slixmpp-2384858f5e6dd7d027b45246bed6085207fca61e.tar.bz2
slixmpp-2384858f5e6dd7d027b45246bed6085207fca61e.tar.xz
slixmpp-2384858f5e6dd7d027b45246bed6085207fca61e.zip
fixed html-im stanza plugin
Diffstat (limited to 'sleekxmpp/stanza')
-rw-r--r--sleekxmpp/stanza/htmlim.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/sleekxmpp/stanza/htmlim.py b/sleekxmpp/stanza/htmlim.py
index d2ccfd6a..f9ee985f 100644
--- a/sleekxmpp/stanza/htmlim.py
+++ b/sleekxmpp/stanza/htmlim.py
@@ -11,24 +11,24 @@ class HTMLIM(ElementBase):
namespace = 'http://jabber.org/protocol/xhtml-im'
name = 'html'
plugin_attrib = 'html'
- interfaces = set(('html'))
+ interfaces = set(('html',))
plugin_attrib_map = set()
plugin_xml_map = set()
def setHtml(self, html):
- if issinstance(html, str):
+ if isinstance(html, str):
html = ET.XML(html)
- if html.find('{http://www.w3.org/1999/xhtml}body') is None:
+ if html.tag != '{http://www.w3.org/1999/xhtml}body':
body = ET.Element('{http://www.w3.org/1999/xhtml}body')
body.append(html)
+ self.xml.append(body)
else:
- body = html
- self.xml.append(html)
+ self.xml.append(html)
def getHtml(self):
html = self.xml.find('{http://www.w3.org/1999/xhtml}body')
if html is None: return ''
- return __str__(html)
+ return html
def delHtml(self):
return self.__del__()