Merge branch 'master' into develop

Conflicts:
	sleekxmpp/basexmpp.py

3 files changed, 8 insertions, 8 deletions

diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py b/sleekxmpp/plugins/xep_0060/stanza/pubsub.py
index 004f0a02..b2fe3010 100644
--- a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py
+++ b/sleekxmpp/plugins/xep_0060/stanza/pubsub.py
@@ -77,12 +77,12 @@ class Item(ElementBase):
         self.append(value)
 
     def get_payload(self):
-        childs = self.xml.getchildren()
+        childs = list(self.xml)
         if len(childs) > 0:
             return childs[0]
 
     def del_payload(self):
-        for child in self.xml.getchildren():
+        for child in self.xml:
             self.xml.remove(child)
 
 
@@ -254,12 +254,12 @@ class PubsubState(ElementBase):
         self.xml.append(value)
 
     def get_payload(self):
-        childs = self.xml.getchildren()
+        childs = list(self.xml)
         if len(childs) > 0:
             return childs[0]
 
     def del_payload(self):
-        for child in self.xml.getchildren():
+        for child in self.xml:
             self.xml.remove(child)
 
 
diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py b/sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py
index aeaeefe0..59cf1a50 100644
--- a/sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py
+++ b/sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py
@@ -33,7 +33,7 @@ class PubsubErrorCondition(ElementBase):
 
     def get_condition(self):
         """Return the condition element's name."""
-        for child in self.parent().xml.getchildren():
+        for child in self.parent().xml:
             if "{%s}" % self.condition_ns in child.tag:
                 cond = child.tag.split('}', 1)[-1]
                 if cond in self.conditions:
@@ -55,7 +55,7 @@ class PubsubErrorCondition(ElementBase):
 
     def del_condition(self):
         """Remove the condition element."""
-        for child in self.parent().xml.getchildren():
+        for child in self.parent().xml:
             if "{%s}" % self.condition_ns in child.tag:
                 tag = child.tag.split('}', 1)[-1]
                 if tag in self.conditions:
diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub_event.py b/sleekxmpp/plugins/xep_0060/stanza/pubsub_event.py
index c0d4929e..32f217fa 100644
--- a/sleekxmpp/plugins/xep_0060/stanza/pubsub_event.py
+++ b/sleekxmpp/plugins/xep_0060/stanza/pubsub_event.py
@@ -31,12 +31,12 @@ class EventItem(ElementBase):
         self.xml.append(value)
 
     def get_payload(self):
-        childs = self.xml.getchildren()
+        childs = list(self.xml)
         if len(childs) > 0:
             return childs[0]
 
     def del_payload(self):
-        for child in self.xml.getchildren():
+        for child in self.xml:
             self.xml.remove(child)