Merge branch 'master' into max_occurs-logging

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:
@@ -26,6 +27,6 @@ docs:
 
 release:
 	pip install twine wheel
-	rm -rf dist/*
+	rm -rf build/* dist/*
 	python setup.py sdist bdist_wheel
 	twine upload -s dist/*

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',

src/zeep/asyncio/transport.py

@@ -4,11 +4,11 @@
 """
 import asyncio
 import logging
-from . import bindings
 
 import aiohttp
 from requests import Response
 
+from zeep.asyncio import bindings
 from zeep.exceptions import TransportError
 from zeep.transports import Transport
 from zeep.utils import get_version

src/zeep/client.py

@@ -13,6 +13,11 @@ class OperationProxy(object):
     def __init__(self, service_proxy, operation_name):
         self._proxy = service_proxy
         self._op_name = operation_name
+        try:
+            signature = str(self._proxy._binding._operations[operation_name])
+            self.__doc__ = signature
+        except:
+            self.__doc__ = 'OperationProxy for %s' % operation_name
 
     def __call__(self, *args, **kwargs):
         """Call the operation with the given args and kwargs.
@@ -67,6 +72,13 @@ def __getitem__(self, key):
             raise AttributeError('Service has no operation %r' % key)
         return OperationProxy(self, key)
 
+    def __dir__(self):
+        """ Return the names of the operations. """
+        return list(dir(super(ServiceProxy, self))
+                    + list(self.__dict__)
+                    + list(self._binding.port_type.operations))
+                    # using list() on the dicts for Python 3 compatibility
+
 
 class Factory(object):
     def __init__(self, types, kind, namespace):
@@ -133,6 +145,10 @@ def __init__(self, wsdl, wsse=None, transport=None,
         self._default_port_name = port_name
         self._default_soapheaders = None
 
+    @property
+    def namespaces(self):
+        return self.wsdl.types.prefix_map
+
     @property
     def service(self):
         """The default ServiceProxy instance

src/zeep/tornado/bindings.py

@@ -1,6 +1,7 @@
-from zeep.wsdl import bindings
 from tornado import gen
 
+from zeep.wsdl import bindings
+
 __all__ = ['AsyncSoap11Binding', 'AsyncSoap12Binding']
 
 

src/zeep/tornado/transport.py

@@ -4,12 +4,12 @@
 """
 import logging
 import urllib
-from . import bindings
 
-from tornado import gen, httpclient
 from requests import Response, Session
 from requests.auth import HTTPBasicAuth, HTTPDigestAuth
+from tornado import gen, httpclient
 
+from zeep.tornado import bindings
 from zeep.transports import Transport
 from zeep.utils import get_version
 from zeep.wsdl.utils import etree_to_string
@@ -89,7 +89,7 @@ def fetch(self, address, method, headers, message=None):
                 auth_password = self.session.password
                 auth_mode = 'digest'
             else:
-                raise StandardError('Not supported authentication.')
+                raise Exception('Not supported authentication.')
 
         # extracting client cert
         client_cert = None
@@ -111,7 +111,8 @@ def fetch(self, address, method, headers, message=None):
             'auth_username': auth_username,
             'auth_password': auth_password,
             'auth_mode': auth_mode,
-            'validate_cert': self.session.verify,
+            'validate_cert': self.session.verify is not None,
+            'ca_certs': self.session.verify,
             'client_key': client_key,
             'client_cert': client_cert
         }
@@ -130,4 +131,4 @@ def new_response(self, response):
         new._content = response.body
         new.status_code = response.code
         new.headers = dict(response.headers.get_all())
-        return new
+        return new

src/zeep/xsd/elements/any.py

@@ -55,7 +55,7 @@ def parse(self, xmlelement, schema, context=None):
         qname = etree.QName(xmlelement.tag)
         if context and context.schemas:
             for context_schema in context.schemas:
-                if context_schema._has_schema_document(qname.namespace):
+                if context_schema.documents.has_schema_document_for_ns(qname.namespace):
                     schema = context_schema
                     break