Changeset 6746 for TI12-security/trunk/NDG_XACML/ndg/xacml/parsers/etree/policyreader.py

Timestamp:

16/03/10 13:26:59 (11 years ago)

Author:

pjkersha

Message:

Added more !ETree readers for the different types.

File:

• TI12-security/trunk/NDG_XACML/ndg/xacml/parsers/etree/policyreader.py (modified) (1 diff)

TI12-security/trunk/NDG_XACML/ndg/xacml/parsers/etree/policyreader.py

@@ -10 +10 @@
 __contact__ = "Philip.Kershaw@stfc.ac.uk"
 __revision__ = "$Id: $"
-from ndg.xacml.parsers.etree.reader import \
-    EtreeAbstractReader
-from ndg.xacml import XMLParseError
-from ndg.xacml.policy import Policy
-from ndg.xacml.variabledefinition import \
-    VariableDefinition
-from ndg.xacml.rule import Rule
-from ndg.xacml.target import Target
+from ndg.xacml.parsers import XMLParseError
+from ndg.xacml.core.policy import Policy
+from ndg.xacml.core.variabledefinition import VariableDefinition
+from ndg.xacml.core.rule import Rule
+from ndg.xacml.core.target import Target
 from ndg.xacml.parsers.etree import QName
-from ndg.xacml.parsers.etree.targetreader import \
-    TargetReader
+from ndg.xacml.parsers.etree.reader import ETreeAbstractReader
+from ndg.xacml.parsers.etree.targetreader import TargetReader
+from ndg.xacml.parsers.etree.rulereader import RuleReader
     
     
-class PolicyReader(EtreeAbstractReader):
+class PolicyReader(ETreeAbstractReader):
     """Parse a Policy Document using ElementTree
     """