Fix issue with empty xsd:import statements on Python 2.7 (#930)

Author: mvantellingen

CHANGES

@@ -1,3 +1,8 @@
+3.3.1 (2019-03-10)
+------------------
+ - Fix issue with empty xsd:import statements on Python 2.7 (#930)
+
+
 3.3.0 (2019-03-08)
 ------------------
  - Extend the force_https flag to also force loading xsd files from https when

src/zeep/loader.py

@@ -83,6 +83,12 @@ def normalize_location(settings, url, base_url):
     enabled.
 
     """
+    # Python 2.7 doesn't accept None to urlparse() calls, but Python 3 does.
+    # So as a guard convert None to '' here so that we can't introduce errors in
+    # Python 2.7 like #930. Can be removed when we drop Python 2 support.
+    if url is None:
+        url = ''
+
     if base_url:
         url = absolute_location(url, base_url)
 

src/zeep/xsd/visitor.py

@@ -166,7 +166,9 @@ def visit_import(self, node, parent):
         namespace = node.get('namespace')
         location = node.get('schemaLocation')
         if location:
-            location = absolute_location(location, self.document._base_url)
+            location = normalize_location(
+                self.schema.settings, location, self.document._location
+            )
 
         if not namespace and not self.document._target_namespace:
             raise XMLParseError(
@@ -185,8 +187,6 @@ def visit_import(self, node, parent):
         if not namespace and not location:
             self.document._has_empty_import = True
 
-        location = normalize_location(self.schema.settings, location, self.document._location)
-
         # Check if the schema is already imported before based on the
         # namespace. Schema's without namespace are registered as 'None'
         document = self.schema.documents.get_by_namespace_and_location(namespace, location)

tests/test_wsdl.py

@@ -1222,3 +1222,44 @@ def test_import_cyclic():
 
     document = wsdl.Document(
         wsdl_content, transport, 'https://tests.python-zeep.org/content.wsdl')
+
+
+def test_import_no_location():
+    node_a = etree.fromstring("""
+        <?xml version="1.0"?>
+        <xs:schema
+            xmlns:xs="http://www.w3.org/2001/XMLSchema"
+            xmlns:tns="http://tests.python-zeep.org/a"
+            targetNamespace="http://tests.python-zeep.org/a"
+            xmlns:b="http://tests.python-zeep.org/b"
+            elementFormDefault="qualified">
+
+        </xs:schema>
+    """.strip())
+
+    wsdl_content = StringIO("""
+    <?xml version='1.0'?>
+    <definitions
+        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+        xmlns:tns="http://tests.python-zeep.org/root"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://tests.python-zeep.org/root" name="root">
+        <types>
+          <xsd:schema
+              xmlns:xs="http://www.w3.org/2001/XMLSchema"
+              xmlns:tns="http://tests.python-zeep.org/b"
+              targetNamespace="http://tests.python-zeep.org/b"
+              elementFormDefault="qualified">
+
+              <xs:import namespace="http://tests.python-zeep.org/a"/>
+              <xs:element name="foo" type="xs:string"/>
+          </xsd:schema>
+        </types>
+    </definitions>
+    """.strip())
+
+    transport = DummyTransport()
+    transport.bind('https://tests.python-zeep.org/a.xsd', node_a)
+
+    document = wsdl.Document(
+        wsdl_content, transport, 'https://tests.python-zeep.org/content.wsdl')