From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 21 Oct 2011 16:34:59 +0000 (-0400)
Subject: Replaced InvalidRSpec with InvalidXML
X-Git-Tag: sfa-1.1-1~70
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=b8fa26126b5d9c1680655c6dfa4faffd18ad0530

Replaced InvalidRSpec with InvalidXML
---

diff --git a/sfa/util/xml.py b/sfa/util/xml.py
index ac6526c8..5a2656c2 100755
--- a/sfa/util/xml.py
+++ b/sfa/util/xml.py
@@ -4,7 +4,7 @@ from StringIO import StringIO
 from datetime import datetime, timedelta
 from sfa.util.xrn import *
 from sfa.util.plxrn import hostname_to_urn
-from sfa.util.faults import SfaNotImplemented, InvalidRSpec, InvalidRSpecElement
+from sfa.util.faults import SfaNotImplemented, InvalidXML
 
 class XpathFilter:
     @staticmethod
@@ -52,7 +52,7 @@ class XML:
             try:
                 tree = etree.parse(StringIO(xml), parser)
             except Exception, e:
-                raise InvalidRSpec(str(e))
+                raise InvalidXML(str(e))
         self.root = tree.getroot()
         # set namespaces map
         self.namespaces = dict(self.root.nsmap)
@@ -82,7 +82,7 @@ class XML:
         if not relaxng(self.root):
             error = relaxng.error_log.last_error
             message = "%s (line %s)" % (error.message, error.line)
-            raise InvalidRSpec(message)
+            raise InvalidXML(message)
         return True
 
     def xpath(self, xpath, namespaces=None):