Merge branch 'master' of github.com:mvantellingen/python-zeep

Author: mvantellingen

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.
@@ -66,6 +71,13 @@ def __getitem__(self, key):
         except ValueError:
             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):

src/zeep/tornado/transport.py

@@ -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
         }

src/zeep/xsd/elements/element.py

@@ -225,7 +225,7 @@ def validate(self, value, render_path=None):
                     path=render_path)
             elif self.max_occurs != 'unbounded' and len(value) > self.max_occurs:
                 raise exceptions.ValidationError(
-                    "Expected at most %d items (maxOccurs check)" % self.min_occurs,
+                    "Expected at most %d items (maxOccurs check)" % self.max_occurs,
                     path=render_path)
 
             for val in value:

tests/test_client.py

@@ -43,6 +43,20 @@ def test_service_proxy_non_existing():
         assert client_obj.service.NonExisting
 
 
+def test_service_proxy_dir_operations():
+    client_obj = client.Client('tests/wsdl_files/soap.wsdl')
+    operations = [op for op in dir(client_obj.service) if not op.startswith('_')]
+    assert set(operations) == set(['GetLastTradePrice', 'GetLastTradePriceNoOutput']) 
+
+
+def test_operation_proxy_doc():
+    client_obj = client.Client('tests/wsdl_files/soap.wsdl')
+    assert (client_obj.service.GetLastTradePrice.__doc__ 
+            == 'GetLastTradePrice(tickerSymbol: xsd:string, '
+                                 'account: ns0:account, '
+                                 'country: ns0:country) -> price: xsd:float')
+
+
 def test_open_from_file_object():
     with open('tests/wsdl_files/soap_transport_err.wsdl', 'rb') as fh:
         client_obj = client.Client(fh)