Changeset 6747 for TI12-security/trunk/NDG_XACML/ndg/xacml/core/attribute.py

Timestamp:

16/03/10 16:40:35 (11 years ago)

Author:

pjkersha

Message:

Adding parsing for Subject type and SubjectMatch? elements.

File:

• TI12-security/trunk/NDG_XACML/ndg/xacml/core/attribute.py (modified) (2 diffs)

TI12-security/trunk/NDG_XACML/ndg/xacml/core/attribute.py

@@ -10 +10 @@
 __contact__ = "Philip.Kershaw@stfc.ac.uk"
 __revision__ = "$Id: $"
-from ndg.xacml.core import PolicyComponent
+from ndg.xacml.core.expression import Expression
+    
 
-
-class AttributeValue(PolicyComponent):
+class AttributeValue(Expression):
     """XACML Attribute Value type"""
-    __slots__ = ('__dataType', '__value')
+    ELEMENT_LOCAL_NAME = 'AttributeValue'
+    __slots__ = ('__value',) 
     
     def __init__(self):
-        self.__dataType = None
+        super(AttributeValue, self).__init__()
         self.__value = None
-        
-    def _get_dataType(self):
-        return self.__dataType
-
-    def _set_dataType(self, value):
-        if not isinstance(value, basestring):
-            raise TypeError('Expecting %r type for "dataType" '
-                            'attribute; got %r' % (basestring, type(value)))
-            
-        self.__dataType = value   
-
-    dataType = property(_get_dataType, _set_dataType, None, 
-                        "attribute value data type")  
-       
+           
     def _get_value(self):
         return self.__value
@@ -44 +32 @@
         self.__value = value  
 
-    value = property(_get_value, _set_value, None, "attribute value")    
+    value = property(_get_value, _set_value, None, "expression value")