Changeset 6786 for TI12-security/trunk

Timestamp:

30/03/10 13:18:10 (10 years ago)

Author:

pjkersha

Message:

Minor fixes including type checking for DecisionType?.eq input.

Location:

TI12-security/trunk/ndg_saml/ndg/saml

Files:

• saml2/core.py (modified) (3 diffs)
• xml/etree.py (modified) (2 diffs)

TI12-security/trunk/ndg_saml/ndg/saml/saml2/core.py

@@ -415 +415 @@
 
     def __eq__(self, decision):
-        return self.__value == decision.value
+        if isinstance(decision, DecisionType):
+            # Cast to string
+            value = decision.value
+            
+        elif isinstance(decision, basestring):
+            value = decision
+            
+        else:
+            raise TypeError('Expecting string or DecisionType instance for '
+                            'input decision value; got %r instead' % 
+                            type(value))
+            
+        if value not in self.__class__.TYPES:
+            raise AttributeError('Permissable decision types are %r; got '
+                                 '%r instead' % (DecisionType.TYPES, value))
+            
+        return self.__value == value
 
 
@@ -1744 +1760 @@
         Sets the Code of this Status.
         
-        @param value:         the Code of this Status
+        @param value: the Code of this Status
         '''
         if not isinstance(value, StatusCode):
@@ -2249 +2265 @@
 class SubjectQuery(RequestAbstractType):
     """SAML 2.0 Core Subject Query type"""
+    
+    DEFAULT_ELEMENT_LOCAL_NAME = 'SubjectQuery'
+    
     __slots__ = ('__subject', )
     

TI12-security/trunk/ndg_saml/ndg/saml/xml/etree.py

@@ -676 +676 @@
             attributeValueElementTree = factory(attributeValue)
             
-            attributeValueElem=attributeValueElementTree.toXML(attributeValue)
+            attributeValueElem = attributeValueElementTree.toXML(attributeValue)
             elem.append(attributeValueElem)
             
@@ -1014 +1014 @@
             issuer.format = issuerFormat
         
+        if elem.text is None:
+            raise XMLTypeParseError('No SAML issuer value set')
+        
         issuer.value = elem.text.strip()