Remove deprecated lxml node.getchildren() calls

Author: mvantellingen

src/zeep/wsdl/bindings/http.py

@@ -148,15 +148,16 @@ def parse(cls, definitions, xmlelement, binding):
         location = http_operation.get('location')
         obj = cls(name, binding, location)
 
-        for node in xmlelement.getchildren():
+        for node in xmlelement:
             tag_name = etree.QName(node.tag).localname
             if tag_name not in ('input', 'output'):
                 continue
 
             # XXX Multiple mime types may be declared as alternatives
             message_node = None
-            if len(node.getchildren()) > 0:
-                message_node = node.getchildren()[0]
+            nodes = list(node)
+            if len(nodes) > 0:
+                message_node = nodes[0]
             message_class = None
             if message_node is not None:
                 if message_node.tag == etree.QName(ns.HTTP, 'urlEncoded'):

src/zeep/wsdl/bindings/soap.py

@@ -423,7 +423,7 @@ def parse(cls, definitions, xmlelement, binding, nsmap):
         else:
             message_class = DocumentMessage
 
-        for node in xmlelement.getchildren():
+        for node in xmlelement:
             tag_name = etree.QName(node.tag).localname
             if tag_name not in ('input', 'output', 'fault'):
                 continue

src/zeep/wsdl/messages/mime.py

@@ -110,7 +110,7 @@ def serialize(self, *args, **kwargs):
         elif self.content_type == 'text/xml':
             document = etree.Element('root')
             self.body.render(document, value)
-            data = etree_to_string(document.getchildren()[0])
+            data = etree_to_string(list(document)[0])
 
         return SerializedMessage(
             path=self.operation.location, headers=headers, content=data)

src/zeep/wsdl/messages/soap.py

@@ -407,7 +407,7 @@ def _deserialize_body(self, xmlelement):
             # TODO: For now we assume that the body only has one child since
             # only one part is specified in the wsdl. This should be handled
             # way better
-            xmlelement = xmlelement.getchildren()[0]
+            xmlelement = list(xmlelement)[0]
 
         context = XmlParserContext(settings=self.wsdl.settings)
         result = self.body.parse(xmlelement, self.wsdl.types, context=context)
@@ -501,7 +501,7 @@ def _deserialize_body(self, body_element):
         """
         process_multiref(body_element)
 
-        response_element = body_element.getchildren()[0]
+        response_element = list(body_element)[0]
         if self.body:
             context = XmlParserContext(self.wsdl.settings)
             result = self.body.parse(

src/zeep/wsdl/parse.py

@@ -97,7 +97,7 @@ def parse_abstract_operation(wsdl, xmlelement):
         'fault_messages': {}
     }
 
-    for msg_node in xmlelement.getchildren():
+    for msg_node in xmlelement:
         tag_name = etree.QName(msg_node.tag).localname
         if tag_name not in ('input', 'output', 'fault'):
             continue

src/zeep/xsd/elements/any.py

@@ -62,7 +62,7 @@ def parse(self, xmlelement, schema, context=None):
                 # Try to parse the any result by iterating all the schemas
                 for context_schema in context.schemas:
                     try:
-                        data = context_schema.deserialize(xmlelement.getchildren()[0])
+                        data = context_schema.deserialize(list(xmlelement)[0])
                         return data
                     except LookupError:
                         continue

src/zeep/xsd/types/any.py

@@ -50,7 +50,7 @@ def parse_xmlelement(self, xmlelement, schema=None, allow_none=True,
         """
         xsi_type = qname_attr(xmlelement, xsi_ns('type'))
         xsi_nil = xmlelement.get(xsi_ns('nil'))
-        children = list(xmlelement.getchildren())
+        children = list(xmlelement)
 
         # Handle xsi:nil attribute
         if xsi_nil == 'true':

src/zeep/xsd/visitor.py

@@ -340,7 +340,7 @@ def visit_element(self, node, parent):
         else:
             qname = etree.QName(node.get('name').strip())
 
-        children = node.getchildren()
+        children = list(node)
         xsd_type = None
         if children:
             value = None
@@ -422,7 +422,7 @@ def visit_attribute(self, node, parent):
         else:
             name = etree.QName(node.get('name'))
 
-        annotation, items = self._pop_annotation(node.getchildren())
+        annotation, items = self._pop_annotation(list(node))
         if items:
             xsd_type = self.visit_simple_type(items[0], node)
         else:
@@ -472,7 +472,7 @@ def visit_simple_type(self, node, parent):
         base_type = '{http://www.w3.org/2001/XMLSchema}string'
         qname = as_qname(name, node.nsmap, self.document._target_namespace)
 
-        annotation, items = self._pop_annotation(node.getchildren())
+        annotation, items = self._pop_annotation(list(node))
         child = items[0]
         if child.tag == tags.restriction:
             base_type = self.visit_restriction_simple_type(child, node)
@@ -535,7 +535,7 @@ def visit_complex_type(self, node, parent):
         xsd_type = None
 
         # Process content
-        annotation, children = self._pop_annotation(node.getchildren())
+        annotation, children = self._pop_annotation(list(node))
         first_tag = children[0].tag if children else None
 
         if first_tag == tags.simpleContent:
@@ -586,8 +586,8 @@ def visit_complex_content(self, node, parent):
         :type parent: lxml.etree._Element
 
         """
-
-        child = node.getchildren()[-1]
+        children = list(node)
+        child = children[-1]
 
         if child.tag == tags.restriction:
             base, element, attributes = self.visit_restriction_complex_content(
@@ -626,7 +626,8 @@ def visit_simple_content(self, node, parent):
 
         """
 
-        child = node.getchildren()[-1]
+        children = list(node)
+        child = children[-1]
 
         if child.tag == tags.restriction:
             return self.visit_restriction_simple_content(child, node)
@@ -659,7 +660,7 @@ def visit_restriction_simple_type(self, node, parent):
         if base_name:
             return self._get_type(base_name)
 
-        annotation, children = self._pop_annotation(node.getchildren())
+        annotation, children = self._pop_annotation(list(node))
         if children[0].tag == tags.simpleType:
             return self.visit_simple_type(children[0], node)
 
@@ -710,7 +711,7 @@ def visit_restriction_complex_content(self, node, parent):
         """
         base_name = qname_attr(node, 'base')
         base_type = self._get_type(base_name)
-        annotation, children = self._pop_annotation(node.getchildren())
+        annotation, children = self._pop_annotation(list(node))
 
         element = None
         attributes = []
@@ -745,7 +746,7 @@ def visit_extension_complex_content(self, node, parent):
         """
         base_name = qname_attr(node, 'base')
         base_type = self._get_type(base_name)
-        annotation, children = self._pop_annotation(node.getchildren())
+        annotation, children = self._pop_annotation(list(node))
 
         element = None
         attributes = []
@@ -773,7 +774,7 @@ def visit_extension_simple_content(self, node, parent):
         """
         base_name = qname_attr(node, 'base')
         base_type = self._get_type(base_name)
-        annotation, children = self._pop_annotation(node.getchildren())
+        annotation, children = self._pop_annotation(list(node))
         attributes = self._process_attributes(node, children)
 
         return base_type, attributes
@@ -853,8 +854,8 @@ def visit_sequence(self, node, parent):
         result = xsd_elements.Sequence(
             min_occurs=min_occurs, max_occurs=max_occurs)
 
-        annotation, items = self._pop_annotation(node.getchildren())
-        for child in items:
+        annotation, children = self._pop_annotation(list(node))
+        for child in children:
             if child.tag not in sub_types:
                 raise self._create_error(
                     "Unexpected element %s in xsd:sequence" % child.tag, child)
@@ -892,8 +893,8 @@ def visit_all(self, node, parent):
         ]
         result = xsd_elements.All()
 
-        annotation, items = self._pop_annotation(node.getchildren())
-        for child in items:
+        annotation, children = self._pop_annotation(list(node))
+        for child in children:
             assert child.tag in sub_types, child
             item = self.process(child, node)
             result.append(item)
@@ -934,7 +935,7 @@ def visit_group(self, node, parent):
         qname = qname_attr(node, 'name', self.document._target_namespace)
 
         # There should be only max nodes, first node (annotation) is irrelevant
-        annotation, children = self._pop_annotation(node.getchildren())
+        annotation, children = self._pop_annotation(list(node))
         child = children[0]
 
         item = self.process(child, parent)
@@ -969,7 +970,7 @@ def visit_list(self, node, parent):
         if item_type:
             sub_type = self._get_type(item_type.text)
         else:
-            subnodes = node.getchildren()
+            subnodes = list(node)
             child = subnodes[-1]  # skip annotation
             sub_type = self.visit_simple_type(child, node)
         return xsd_types.ListType(sub_type)
@@ -988,8 +989,7 @@ def visit_choice(self, node, parent):
         """
         min_occurs, max_occurs = _process_occurs_attrs(node)
 
-        children = node.getchildren()
-        annotation, children = self._pop_annotation(children)
+        annotation, children = self._pop_annotation(list(node))
 
         choices = []
         for child in children:
@@ -1025,7 +1025,7 @@ def visit_union(self, node, parent):
                 xsd_type = self._get_type(qname)
                 types.append(xsd_type)
         else:
-            annotation, types = self._pop_annotation(node.getchildren())
+            annotation, types = self._pop_annotation(list(node))
             types = [self.visit_simple_type(t, node) for t in types]
         return xsd_types.UnionType(types)
 
@@ -1076,7 +1076,7 @@ def visit_attribute_group(self, node, parent):
             return ref
 
         qname = qname_attr(node, 'name', self.document._target_namespace)
-        annotation, children = self._pop_annotation(node.getchildren())
+        annotation, children = self._pop_annotation(list(node))
 
         attributes = self._process_attributes(node, children)
         attribute_group = xsd_elements.AttributeGroup(qname, attributes)

tests/test_client.py

@@ -218,7 +218,7 @@ def test_default_soap_headers():
         doc = load_xml(m.request_history[0].body)
         header = doc.find('{http://schemas.xmlsoap.org/soap/envelope/}Header')
         assert header is not None
-        assert len(header.getchildren()) == 2
+        assert len(list(header)) == 2
 
 
 @pytest.mark.requests
@@ -263,4 +263,4 @@ def test_default_soap_headers_extra():
         doc = load_xml(m.request_history[0].body)
         header = doc.find('{http://schemas.xmlsoap.org/soap/envelope/}Header')
         assert header is not None
-        assert len(header.getchildren()) == 4
+        assert len(list(header)) == 4

tests/test_helpers.py

@@ -144,7 +144,7 @@ def test_serialize_any_array():
     assert_nodes_equal(expected, node)
 
     schema = xsd.Schema()
-    obj = custom_type.parse(node.getchildren()[0], schema=schema)
+    obj = custom_type.parse(list(node)[0], schema=schema)
     result = serialize_object(obj)
 
     assert result == {