summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/stanzabase.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-06-19 09:47:31 -0700
committerLance Stout <lancestout@gmail.com>2012-06-19 09:47:31 -0700
commit7858d969d82eaaa7124b8d59a68c286f06cbf758 (patch)
tree63c6c988eea16da3d6c8dc9c42c357ed668171a8 /sleekxmpp/xmlstream/stanzabase.py
parent811955104968a055c651ea1fe97adc9f0ae61676 (diff)
downloadslixmpp-7858d969d82eaaa7124b8d59a68c286f06cbf758.tar.gz
slixmpp-7858d969d82eaaa7124b8d59a68c286f06cbf758.tar.bz2
slixmpp-7858d969d82eaaa7124b8d59a68c286f06cbf758.tar.xz
slixmpp-7858d969d82eaaa7124b8d59a68c286f06cbf758.zip
Remove usage of deprecated getchildren() method.
Diffstat (limited to 'sleekxmpp/xmlstream/stanzabase.py')
-rw-r--r--sleekxmpp/xmlstream/stanzabase.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py
index 766bdb01..a653034e 100644
--- a/sleekxmpp/xmlstream/stanzabase.py
+++ b/sleekxmpp/xmlstream/stanzabase.py
@@ -445,7 +445,7 @@ class ElementBase(object):
return
# Initialize values using provided XML
- for child in self.xml.getchildren():
+ for child in self.xml:
if child.tag in self.plugin_tag_map:
plugin_class = self.plugin_tag_map[child.tag]
self.init_plugin(plugin_class.plugin_attrib,
@@ -1050,8 +1050,7 @@ class ElementBase(object):
if parent is None:
parent = self.xml
for element in elements:
- if element.tag == original_target or \
- not element.getchildren():
+ if element.tag == original_target or not list(element):
# Only delete the originally requested elements, and
# any parent elements that have become empty.
elem_lang = element.attrib.get('{%s}lang' % XML_NS,
@@ -1491,7 +1490,7 @@ class StanzaBase(ElementBase):
def get_payload(self):
"""Return a list of XML objects contained in the stanza."""
- return self.xml.getchildren()
+ return list(self.xml)
def set_payload(self, value):
"""Add XML content to the stanza.