Don't use the target namespace for union / arraytype lookups

Author: mvantellingen

src/zeep/utils.py

@@ -12,7 +12,7 @@ def qname_attr(node, attr_name, target_namespace=None):
         return as_qname(value, node.nsmap, target_namespace)
 
 
-def as_qname(value, nsmap, target_namespace):
+def as_qname(value, nsmap, target_namespace=None):
     """Convert the given value to a QName"""
     if ':' in value:
         prefix, local = value.split(':')

src/zeep/xsd/visitor.py

@@ -383,8 +383,7 @@ def visit_attribute(self, node, parent):
             match = re.match('([^\[]+)', array_type)
             if match:
                 array_type = match.groups()[0]
-                qname = as_qname(
-                    array_type, node.nsmap, self.document._target_namespace)
+                qname = as_qname(array_type, node.nsmap)
                 array_type = xsd_types.UnresolvedType(qname, self.schema)
 
         # If the elment has a ref attribute then all other attributes cannot
@@ -987,7 +986,7 @@ def visit_union(self, node, parent):
         types = []
         if members:
             for member in members.split():
-                qname = as_qname(member, node.nsmap, self.document._target_namespace)
+                qname = as_qname(member, node.nsmap)
                 xsd_type = self._get_type(qname)
                 types.append(xsd_type)
         else:

tests/test_xsd_attributes.py

@@ -373,7 +373,7 @@ def test_attribute_union_type():
             <restriction base="xsd:string"/>
           </simpleType>
           <simpleType name="parent">
-            <union memberTypes="one two"/>
+            <union memberTypes="tns:one tns:two"/>
           </simpleType>
           <simpleType name="two">
             <restriction base="xsd:string"/>

tests/test_xsd_union.py

@@ -6,6 +6,7 @@ def test_union_same_types():
     schema = xsd.Schema(load_xml("""
         <?xml version="1.0"?>
         <xsd:schema
+            xmlns="http://tests.python-zeep.org/"
             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             xmlns:tns="http://tests.python-zeep.org/"
             targetNamespace="http://tests.python-zeep.org/"
@@ -21,7 +22,7 @@ def test_union_same_types():
           </xsd:simpleType>
 
           <xsd:simpleType name="Date">
-            <xsd:union memberTypes="MMYY MMYYYY"/>
+            <xsd:union memberTypes="tns:MMYY MMYYYY"/>
           </xsd:simpleType>
           <xsd:element name="item" type="tns:Date"/>
         </xsd:schema>
@@ -49,7 +50,7 @@ def test_union_mixed():
             elementFormDefault="qualified">
           <xsd:element name="item" type="tns:Date"/>
           <xsd:simpleType name="Date">
-            <xsd:union memberTypes="xsd:date xsd:gYear xsd:gYearMonth MMYY MMYYYY"/>
+            <xsd:union memberTypes="xsd:date xsd:gYear xsd:gYearMonth tns:MMYY tns:MMYYYY"/>
           </xsd:simpleType>
           <xsd:simpleType name="MMYY">
             <xsd:restriction base="xsd:string">