Run make format

Author: mvantellingen

Diff for: Makefile

@@ -23,7 +23,7 @@ coverage:
 	pytest --cov=zeep --cov-report=term-missing --cov-report=html
 
 format:
-	isort --recursive src tests setup.py
+	isort src tests setup.py
 	black src/ tests/ setup.py
 
 docs:

Diff for: src/zeep/client.py

@@ -1,7 +1,7 @@
 import logging
 import typing
 
-from zeep.proxy import ServiceProxy, AsyncServiceProxy
+from zeep.proxy import AsyncServiceProxy, ServiceProxy
 from zeep.settings import Settings
 from zeep.transports import AsyncTransport, Transport
 from zeep.wsdl import Document
@@ -50,6 +50,7 @@ class Client:
     :param settings: a zeep.Settings() object
 
     """
+
     _default_transport = Transport
 
     def __init__(
@@ -66,7 +67,9 @@ def __init__(
             raise ValueError("No URL given for the wsdl")
 
         self.settings = settings or Settings()
-        self.transport = transport if transport is not None else self._default_transport()
+        self.transport = (
+            transport if transport is not None else self._default_transport()
+        )
         self.wsdl = Document(wsdl, self.transport, settings=self.settings)
         self.wsse = wsse
         self.plugins = plugins if plugins is not None else []

Diff for: src/zeep/proxy.py

@@ -41,7 +41,7 @@ def __call__(self, *args, **kwargs):
         """
         soap_headers = self._merge_soap_headers(kwargs.get("_soapheaders"))
         if soap_headers:
-            kwargs['_soapheaders'] = soap_headers
+            kwargs["_soapheaders"] = soap_headers
 
         return self._proxy._binding.send(
             self._proxy._client,
@@ -53,14 +53,13 @@ def __call__(self, *args, **kwargs):
 
 
 class AsyncOperationProxy(OperationProxy):
-
     async def __call__(self, *args, **kwargs):
         """Call the operation with the given args and kwargs.
 
         :rtype: zeep.xsd.CompoundValue
 
         """
-        kwargs['_soapheaders'] = self._merge_soap_headers(kwargs.get("_soapheaders"))
+        kwargs["_soapheaders"] = self._merge_soap_headers(kwargs.get("_soapheaders"))
 
         return await self._proxy._binding.send_async(
             self._proxy._client,

Diff for: src/zeep/wsdl/wsdl.py

@@ -15,7 +15,12 @@
 from lxml import etree
 
 from zeep.exceptions import IncompleteMessage
-from zeep.loader import absolute_location, is_relative_path, load_external, load_external_async
+from zeep.loader import (
+    absolute_location,
+    is_relative_path,
+    load_external,
+    load_external_async,
+)
 from zeep.settings import Settings
 from zeep.utils import findall_multiple_ns
 from zeep.wsdl import parse
@@ -156,7 +161,6 @@ def _add_definition(self, definition: "Definition"):
         self._definitions[key] = definition
 
 
-
 class Definition:
     """The Definition represents one wsdl:definition within a Document.
 

Diff for: src/zeep/wsse/username.py

@@ -52,11 +52,11 @@ def __init__(
         zulu_timestamp=None,
         hash_password=None,
     ):
-        '''
+        """
         Some SOAP services want zulu timestamps with Z in timestamps and
         in password digests they may want password to be hashed before
         adding it to nonce and created.
-        '''
+        """
         self.username = username
         self.password = password
         self.password_digest = password_digest
@@ -67,7 +67,6 @@ def __init__(
         self.zulu_timestamp = zulu_timestamp
         self.hash_password = hash_password
 
-
     def apply(self, envelope, headers):
         security = utils.get_security_header(envelope)
 
@@ -117,7 +116,9 @@ def _create_password_digest(self):
         # digest = Base64 ( SHA-1 ( nonce + created + password ) )
         if not self.password_digest and self.hash_password:
             digest = base64.b64encode(
-                hashlib.sha1(nonce + timestamp.encode("utf-8") + hashlib.sha1(password).digest()).digest()
+                hashlib.sha1(
+                    nonce + timestamp.encode("utf-8") + hashlib.sha1(password).digest()
+                ).digest()
             ).decode("ascii")
         elif not self.password_digest:
             digest = base64.b64encode(

Diff for: src/zeep/xsd/types/builtins.py

@@ -39,11 +39,13 @@ def _treat_whitespace(func):
         def _wrapper(self, value):
             assert behaviour in ["replace", "collapse", "preserve"]
             if behaviour == "replace":
-                return func(self, re.sub(r'[\n\r\t]', ' ', value))
+                return func(self, re.sub(r"[\n\r\t]", " ", value))
             elif behaviour == "collapse":
-                return func(self, re.sub(r'[\n\r\t ]', ' ', value).strip())
+                return func(self, re.sub(r"[\n\r\t ]", " ", value).strip())
             return func(self, value)
+
         return _wrapper
+
     return _treat_whitespace
 
 
@@ -71,7 +73,7 @@ class Boolean(BuiltinType):
     def xmlvalue(self, value):
         return "true" if value and value not in ("false", "0") else "false"
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
         """Return True if the 'true' or '1'. 'false' and '0' are legal false
         values, but we consider everything not true as false.
@@ -88,7 +90,7 @@ class Decimal(BuiltinType):
     def xmlvalue(self, value):
         return str(value)
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
         return _Decimal(value)
 
@@ -100,7 +102,7 @@ class Float(BuiltinType):
     def xmlvalue(self, value):
         return str(value).upper()
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
         return float(value)
 
@@ -113,7 +115,7 @@ class Double(BuiltinType):
     def xmlvalue(self, value):
         return str(value)
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
         return float(value)
 
@@ -126,7 +128,7 @@ class Duration(BuiltinType):
     def xmlvalue(self, value):
         return isodate.duration_isoformat(value)
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
         if value.startswith("PT-"):
             value = value.replace("PT-", "PT")
@@ -162,7 +164,7 @@ def xmlvalue(self, value):
             return isodate.isostrf.strftime(value, "%Y-%m-%dT%H:%M:%S.%f%Z")
         return isodate.isostrf.strftime(value, "%Y-%m-%dT%H:%M:%S%Z")
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
 
         # Determine based on the length of the value if it only contains a date
@@ -185,7 +187,7 @@ def xmlvalue(self, value):
             return isodate.isostrf.strftime(value, "%H:%M:%S.%f%Z")
         return isodate.isostrf.strftime(value, "%H:%M:%S%Z")
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
         return isodate.parse_time(value)
 
@@ -200,7 +202,7 @@ def xmlvalue(self, value):
             return value
         return isodate.isostrf.strftime(value, "%Y-%m-%d")
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
         return isodate.parse_date(value)
 
@@ -224,7 +226,7 @@ def xmlvalue(self, value):
         year, month, tzinfo = value
         return "%04d-%02d%s" % (year, month, _unparse_timezone(tzinfo))
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
         match = self._pattern.match(value)
         if not match:
@@ -253,7 +255,7 @@ def xmlvalue(self, value):
         year, tzinfo = value
         return "%04d%s" % (year, _unparse_timezone(tzinfo))
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
         match = self._pattern.match(value)
         if not match:
@@ -281,7 +283,7 @@ def xmlvalue(self, value):
         month, day, tzinfo = value
         return "--%02d-%02d%s" % (month, day, _unparse_timezone(tzinfo))
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
         match = self._pattern.match(value)
         if not match:
@@ -312,7 +314,7 @@ def xmlvalue(self, value):
         day, tzinfo = value
         return "---%02d%s" % (day, _unparse_timezone(tzinfo))
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
         match = self._pattern.match(value)
         if not match:
@@ -337,7 +339,7 @@ def xmlvalue(self, value):
         month, tzinfo = value
         return "--%d%s" % (month, _unparse_timezone(tzinfo))
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
         match = self._pattern.match(value)
         if not match:
@@ -378,7 +380,7 @@ class AnyURI(BuiltinType):
     def xmlvalue(self, value):
         return value
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
         return value
 
@@ -391,7 +393,7 @@ class QName(BuiltinType):
     def xmlvalue(self, value):
         return value
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
         return value
 
@@ -408,15 +410,15 @@ class Notation(BuiltinType):
 class NormalizedString(String):
     _default_qname = xsd_ns("normalizedString")
 
-    @treat_whitespace('replace')
+    @treat_whitespace("replace")
     def pythonvalue(self, value):
         return value
 
 
 class Token(NormalizedString):
     _default_qname = xsd_ns("token")
 
-    @treat_whitespace('collapse')
+    @treat_whitespace("collapse")
     def pythonvalue(self, value):
         return value
 

Diff for: src/zeep/xsd/types/collection.py

@@ -7,10 +7,10 @@
 from zeep.xsd.types.simple import AnySimpleType
 
 if typing.TYPE_CHECKING:
+    from zeep.xsd.schema import Schema
     from zeep.xsd.types.base import Type
     from zeep.xsd.types.complex import ComplexType
     from zeep.xsd.valueobjects import CompoundValue
-    from zeep.xsd.schema import Schema
 
 __all__ = ["ListType", "UnionType"]
 
@@ -80,7 +80,9 @@ def parse_xmlelement(
         allow_none: bool = True,
         context: XmlParserContext = None,
         schema_type: "Type" = None,
-    ) -> typing.Optional[typing.Union[str, "CompoundValue", typing.List[etree._Element]]]:
+    ) -> typing.Optional[
+        typing.Union[str, "CompoundValue", typing.List[etree._Element]]
+    ]:
         if self.item_class:
             return self.item_class().parse_xmlelement(
                 xmlelement, schema, allow_none, context

Diff for: tests/test_async_transport.py

@@ -5,10 +5,9 @@
 from pretend import stub
 from pytest_httpx import HTTPXMock
 
-
 from zeep import exceptions
-from zeep.transports import AsyncTransport
 from zeep.cache import InMemoryCache
+from zeep.transports import AsyncTransport
 
 
 @pytest.mark.requests
@@ -69,7 +68,9 @@ async def test_session_close(httpx_mock: HTTPXMock):
 async def test_http_error(httpx_mock: HTTPXMock):
     transport = AsyncTransport()
 
-    httpx_mock.add_response(url="http://tests.python-zeep.org/test.xml", data="x", status_code=500)
+    httpx_mock.add_response(
+        url="http://tests.python-zeep.org/test.xml", data="x", status_code=500
+    )
     with pytest.raises(exceptions.TransportError) as exc:
         transport.load("http://tests.python-zeep.org/test.xml")
         assert exc.value.status_code == 500

Diff for: tests/test_xsd_builtins.py

@@ -280,7 +280,10 @@ def test_pythonvalue(self):
         assert instance.pythonvalue("2001+00:00") == (2001, pytz.utc)
         assert instance.pythonvalue("-2001") == (-2001, None)
         assert instance.pythonvalue("-20000") == (-20000, None)
-        assert instance.pythonvalue("  \t2001+02:00\r\n ") == (2001, pytz.FixedOffset(120))
+        assert instance.pythonvalue("  \t2001+02:00\r\n ") == (
+            2001,
+            pytz.FixedOffset(120),
+        )
 
         with pytest.raises(builtins.ParseError):
             assert instance.pythonvalue("99")