Try the non-caching zeep client on older versions

arthurdejong · arthurdejong · commit 7bb0e5f5eb65 · 2018-01-03T15:47:49.000+01:00
This uses the "normal" Client class from zeep if CachingClient is not
available (this is the case on older zeep versions).

This also records (and documents) the dependencies for SOAP libraries in
setup.py.
diff --git a/setup.py b/setup.py
@@ -68,7 +68,11 @@
       packages=find_packages(),
       package_data={'': ['*.dat']},
       extras_require={
-          'VIES':  ['suds'],
-          'VIES-ALT':  ['PySimpleSOAP'],
+          # The SOAP feature is only required for a number of online tests
+          # of numbers such as the EU VAT VIES lookup, the Dominican Republic
+          # DGII services or the Turkish T.C. Kimlik validation.
+          'SOAP':  ['zeep'],     # recommended implementation
+          'SOAP-ALT': ['suds'],  # but this should also work
+          'SOAP-FALLBACK':  ['PySimpleSOAP'],  # this is a fallback
           },
       )
diff --git a/stdnum/util.py b/stdnum/util.py
@@ -178,22 +178,28 @@ def get_soap_client(wsdlurl):  # pragma: no cover (not part of normal test suite
     # this function isn't automatically tested because the functions using
     # it are not automatically tested
     if wsdlurl not in _soap_clients:
-        try:
-            from urllib import getproxies
-        except ImportError:
-            from urllib.request import getproxies
         # try zeep first
         try:
             from zeep import CachingClient
             client = CachingClient(wsdlurl).service
         except ImportError:
-            # fall back to suds
+            # fall back to non-caching zeep client
             try:
-                from suds.client import Client
-                client = Client(wsdlurl, proxy=getproxies()).service
+                from zeep import Client
+                client = Client(wsdlurl).service
             except ImportError:
-                # use pysimplesoap as last resort
-                from pysimplesoap.client import SoapClient
-                client = SoapClient(wsdl=wsdlurl, proxy=getproxies())
+                # other implementations require passing the proxy config
+                try:
+                    from urllib import getproxies
+                except ImportError:
+                    from urllib.request import getproxies
+                # fall back to suds
+                try:
+                    from suds.client import Client
+                    client = Client(wsdlurl, proxy=getproxies()).service
+                except ImportError:
+                    # use pysimplesoap as last resort
+                    from pysimplesoap.client import SoapClient
+                    client = SoapClient(wsdl=wsdlurl, proxy=getproxies())
         _soap_clients[wsdlurl] = client
     return _soap_clients[wsdlurl]
