Changeset 6580

Timestamp:

16/02/10 17:10:49 (11 years ago)

Author:

pjkersha

Message:

SOAP client - added capability for custom headers and setting SOAPAction field.

File:

• TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/soap/client.py (modified) (3 diffs)

TI12-security/trunk/NDGSecurity/python/ndg_security_common/ndg/security/common/soap/client.py

@@ -143 +143 @@
         return self.__fileobject
 
+
+class CapitalizedKeysDict(dict):
+    """Extend dict type to make keys capitalized.  Keys must be string type"""
+    def __init__(self, *arg, **kw):
+        if len(arg) > 0:
+            if isinstance(arg[0], dict):
+                arg[0] = [(k.capitalize(), v) for k, v in arg[0].items()]
+            else:
+                arg[0] = [(k.capitalize(), v) for k, v in arg[0]] 
+        
+        kw = dict([(k.capitalize(), v) for k, v in kw.items()])
+        
+        super(CapitalizedKeysDict, self).__init__(*arg, **kw)
+        
+    def __setitem__(self, k, v):
+        if not isinstance(k, basestring):
+            raise TypeError('Key must be string type; got %r' % type(k))
+        
+        super(CapitalizedKeysDict, self).__setitem__(k.capitalize(), v)
+        
     
 class UrlLib2SOAPClient(SOAPClientBase):
     """urllib2 based SOAP Client"""
-    DEFAULT_HTTP_HEADER = {'Content-type': 'text/xml'}
+    DEFAULT_HTTP_HEADER = CapitalizedKeysDict({'Content-type': 'text/xml'})
     
     def __init__(self):
@@ -156 +176 @@
         self.__httpHeader = UrlLib2SOAPClient.DEFAULT_HTTP_HEADER.copy()
 
-    def _getHttpHeader(self):
+    @property
+    def httpHeader(self):
+        "Set HTTP header fields in this dict object"
         return self.__httpHeader
 
-    def _setHttpHeader(self, value):
-        if not isinstance(value, dict):
-            raise TypeError('Expecting dict type for "httpHeader" attribute; '
-                            'got %r instead' % type(value))
-        self.__httpHeader = value
-
-    httpHeader = property(_getHttpHeader, _setHttpHeader, 
-                          doc="Set HTTP header fields in this dict object")
-
+    def _getSOAPAction(self):
+        return self.__httpHeader.get('Soapaction')
+
+    def _setSOAPAction(self, value):
+        if not isinstance(value, basestring):
+            raise TypeError("Setting request soapAction: got %r, expecting "
+                            "string type" % type(value))
+        self.__httpHeader['Soapaction'] = value
+        
+    soapAction = property(fget=_getSOAPAction, 
+                          fset=_setSOAPAction, 
+                          doc="SOAPAction HTTP header field setting") 
+       
     def _getTimeout(self):
         return self.__timeout
@@ -174 +200 @@
         if not isinstance(value, (int, float)):
             raise TypeError("Setting request timeout: got %r, expecting int "
-                            "float type" % type(value))
+                            "or float type" % type(value))
         self.__timeout = value