lint

Author: mvantellingen

Makefile

@@ -5,7 +5,8 @@ install:
 	pip install bumpversion twine wheel
 
 lint:
-	flake8 src/ tests/
+	flake8 src/ 
+	flake8 --ignore=E501 tests/ 
 	isort --recursive --check-only --diff src tests
 
 clean:

setup.py

@@ -39,7 +39,7 @@
     'pytest-tornado==0.4.5',
 
     # Linting
-    'isort==4.2.5',
+    'isort==4.2.15',
     'flake8==3.3.0',
     'flake8-blind-except==0.1.1',
     'flake8-debugger==1.4.0',

tests/test_asyncio_transport.py

@@ -4,7 +4,7 @@
 from lxml import etree
 from pretend import stub
 
-from zeep import asyncio, cache, exceptions
+from zeep import asyncio, exceptions
 
 
 @pytest.mark.requests

tests/test_client_factory.py

@@ -13,7 +13,7 @@ def test_factory_namespace():
 
 def test_factory_no_reference():
     client = Client('tests/wsdl_files/soap.wsdl')
-    factory = client.type_factory('http://example.com/stockquote.xsd')
+
     obj_1 = client.get_type('ns0:ArrayOfAddress')()
     obj_1.Address.append({
         'NameFirst': 'J',

tests/test_helpers.py

@@ -2,7 +2,6 @@
 from collections import OrderedDict
 
 from lxml import etree
-from six import binary_type
 
 from tests.utils import assert_nodes_equal, load_xml, render_node
 from zeep import helpers, xsd

tests/test_soap_multiref.py

@@ -1,13 +1,9 @@
 import io
 
 import pytest
-import requests_mock
-from lxml import etree
 from pretend import stub
-from six import StringIO
 
-from tests.utils import DummyTransport, assert_nodes_equal
-from zeep import Client, wsdl
+from zeep import Client
 from zeep.transports import Transport
 
 
@@ -74,10 +70,12 @@ def test_parse_multiref_soap_response():
             <wsdl:operation name="TestOperation">
               <soap:operation soapAction=""/>
               <wsdl:input name="TestOperationRequest">
-                <soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
               </wsdl:input>
               <wsdl:output name="TestOperationResponse">
-                <soap:body use="encoded" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+                <soap:body use="encoded"
+                           encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
               </wsdl:output>
             </wsdl:operation>
           </wsdl:binding>
@@ -88,7 +86,7 @@ def test_parse_multiref_soap_response():
             </wsdl:port>
           </wsdl:service>
         </wsdl:definitions>
-    """.strip())
+    """.strip())  # noqa
 
     content = """
         <?xml version="1.0"?>
@@ -217,7 +215,7 @@ def test_parse_multiref_soap_response_child():
             </wsdl:port>
           </wsdl:service>
         </wsdl:definitions>
-    """.strip())
+    """.strip())  # noqa
 
     content = """
         <?xml version="1.0"?>
@@ -246,7 +244,7 @@ def test_parse_multiref_soap_response_child():
               </multiRef>
            </soapenv:Body>
         </soapenv:Envelope>
-    """.strip()
+    """.strip()  # noqa
 
     client = Client(wsdl_file, transport=Transport(),)
     response = stub(

tests/test_soap_xop.py

@@ -1,13 +1,10 @@
-import io
-
-import pytest
 import requests_mock
 from lxml import etree
 from pretend import stub
 from requests_toolbelt.multipart.decoder import MultipartDecoder
 from six import StringIO
 
-from tests.utils import assert_nodes_equal, load_xml
+from tests.utils import assert_nodes_equal
 from zeep import Client
 from zeep.transports import Transport
 from zeep.wsdl.attachments import MessagePack
@@ -52,10 +49,6 @@ def test_rebuild_xml():
             'Content-Type': 'multipart/related; boundary=MIME_boundary; type="application/soap+xml"; start="<[email protected]>" 1'
         }
     )
-    client = stub(
-        transport=None,
-        wsdl=stub(strict=True),
-        xml_huge_tree=False)
 
     decoder = MultipartDecoder(
         response.content, response.headers['Content-Type'], 'utf-8')

tests/test_wsdl_messages_document.py

@@ -65,58 +65,6 @@ def test_parse():
     assert operation.output.signature(as_output=True) == 'xsd:string'
 
 
-def test_empty_input_parse():
-    wsdl_content = StringIO("""
-    <definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
-                 xmlns:tns="http://tests.python-zeep.org/tns"
-                 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-                 xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                 targetNamespace="http://tests.python-zeep.org/tns">
-      <types>
-        <xsd:schema targetNamespace="http://tests.python-zeep.org/tns">
-          <xsd:element name="Request" type="xsd:string"/>
-          <xsd:element name="Response" type="xsd:string"/>
-        </xsd:schema>
-      </types>
-
-      <message name="Input"/>
-      <message name="Output">
-        <part element="tns:Response"/>
-      </message>
-
-      <portType name="TestPortType">
-        <operation name="TestOperation">
-          <input message="Input"/>
-          <output message="Output"/>
-        </operation>
-      </portType>
-
-      <binding name="TestBinding" type="tns:TestPortType">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="TestOperation">
-          <soap:operation soapAction=""/>
-          <input>
-            <soap:body use="literal"/>
-          </input>
-          <output>
-            <soap:body use="literal"/>
-          </output>
-        </operation>
-      </binding>
-    </definitions>
-    """.strip())
-
-    root = wsdl.Document(wsdl_content, None)
-
-    binding = root.bindings['{http://tests.python-zeep.org/tns}TestBinding']
-    operation = binding.get('TestOperation')
-
-    assert operation.input.body.signature(schema=root.types) == 'soap-env:Body()'
-    assert operation.input.header.signature(schema=root.types) == 'soap-env:Header()'
-    assert operation.input.envelope.signature(schema=root.types) == 'soap-env:envelope(body: {})'
-    assert operation.input.signature(as_output=False) == ''
-
-
 def test_parse_with_header():
     wsdl_content = StringIO("""
     <definitions xmlns="http://schemas.xmlsoap.org/wsdl/"

tests/test_wsse_signature.py

@@ -2,7 +2,6 @@
 import sys
 
 import pytest
-from lxml import etree
 
 from tests.utils import load_xml
 from zeep import wsse

tests/test_xsd_indicators_choice.py

@@ -770,6 +770,8 @@ def test_choice_with_sequence_change():
     element.render(node, elm)
     assert_nodes_equal(expected, node)
     value = element.parse(node[0], schema)
+    assert value.item_1 == 'bla-1'
+    assert value.item_2 == 'bla-2'
 
 
 def test_choice_with_sequence_change_named():
@@ -815,6 +817,8 @@ def test_choice_with_sequence_change_named():
     element.render(node, elm)
     assert_nodes_equal(expected, node)
     value = element.parse(node[0], schema)
+    assert value.item_1 == 'bla-1'
+    assert value.item_2 == 'bla-2'
 
 
 def test_choice_with_sequence_multiple():