fixed html-im stanza plugin

This commit is contained in:
Nathan Fritz
2010-04-07 23:56:44 -07:00
parent dd77d2165d
commit 2384858f5e
3 changed files with 26 additions and 7 deletions

View File

@@ -202,7 +202,7 @@ class basexmpp(object):
message['body'] = mbody
message['subject'] = msubject
if mnick is not None: message['nick'] = mnick
if mhtml is not None: message['html'] = mhtml
if mhtml is not None: message['html']['html'] = mhtml
return message
def makePresence(self, pshow=None, pstatus=None, ppriority=None, pto=None, ptype=None, pfrom=None):

View File

@@ -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__()