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

Modified ElementBase _getSubText, _setSubText, and _delSubText to

Browse source 
use the namespace in a tag name if one is given and to use
self.namespace otherwise.
This commit is contained in:
Lance Stout 2010-07-29 11:04:21 -04:00
parent e8e934fa95
commit d148f633f3
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sleekxmpp/xmlstream/stanzabase.py
View file

@ -239,26 +239,31 @@ class ElementBase(tostring.ToString):
return self.xml.attrib.get(name, '') return self.xml.attrib.get(name, '')
def _getSubText(self, name): def _getSubText(self, name):
stanza = self.xml.find("{%s}%s" % (self.namespace, name)) if '}' not in name:
name = "{%s}%s" % (self.namespace, name)
stanza = self.xml.find(name)
if stanza is None or stanza.text is None: if stanza is None or stanza.text is None:
return '' return ''
else: else:
return stanza.text return stanza.text
def _setSubText(self, name, attrib={}, text=None): def _setSubText(self, name, attrib={}, text=None):
if '}' not in name:
name = "{%s}%s" % (self.namespace, name)
if text is None or text == '': if text is None or text == '':
return self.__delitem__(name) return self.__delitem__(name)
stanza = self.xml.find("{%s}%s" % (self.namespace, name)) stanza = self.xml.find(name)
if stanza is None: if stanza is None:
#self.xml.append(ET.Element("{%s}%s" % (self.namespace, name), attrib)) stanza = ET.Element(name)
stanza = ET.Element("{%s}%s" % (self.namespace, name))
self.xml.append(stanza) self.xml.append(stanza)
stanza.text = text stanza.text = text
return stanza return stanza
def _delSub(self, name): def _delSub(self, name):
if '}' not in name:
name = "{%s}%s" % (self.namespace, name)
for child in self.xml.getchildren(): for child in self.xml.getchildren():
if child.tag == "{%s}%s" % (self.namespace, name): if child.tag == name:
self.xml.remove(child) self.xml.remove(child)
def getStanzaValues(self): def getStanzaValues(self):