Merge remote-tracking branch 'local_master/geni-v3' into geni-v3

[sfa.git] / sfa / util / faults.py

diff --git a/sfa/util/faults.py b/sfa/util/faults.py
index 245d90c..4a614b1 100644 (file)
--- a/sfa/util/faults.py
+++ b/sfa/util/faults.py
@@ -35,12 +35,12 @@ class SfaFault(xmlrpclib.Fault):
 
 class Forbidden(SfaFault):
     def __init__(self,  extra = None):
-        faultString = "FORBIDDEN:" 
+        faultString = "FORBIDDEN" 
         SfaFault.__init__(self, GENICODE.FORBIDDEN, faultString, extra)   
 
 class BadArgs(SfaFault):
     def __init__(self,  extra = None):
-        faultString = "BADARGS:"
+        faultString = "BADARGS"
         SfaFault.__init__(self, GENICODE.BADARGS, faultString, extra)
 
 
@@ -98,7 +98,7 @@ class SfaNotImplemented(SfaFault):
 
 class SfaAPIError(SfaFault):
     def __init__(self, extra = None):
-        faultString = "Internal API error"
+        faultString = "Internal SFA API error"
         SfaFault.__init__(self, GENICODE.SERVERERROR, faultString, extra)
 
 class MalformedHrnException(SfaFault):
@@ -329,7 +329,7 @@ class InvalidXML(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Invalid XML Document: %(value)s" % locals()
-        SfaFault.__init__(self, GENICODE.ERROR, faultString, extra)
+        SfaFault.__init__(self, GENICODE.BADARGS, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
@@ -341,10 +341,13 @@ class AccountNotEnabled(SfaFault):
         return repr(self.value)
 
 class CredentialNotVerifiable(SfaFault):
-    def __init__(self, value, extra = None):
+    def __init__(self, value=None, extra = None):
         self.value = value
-        faultString = "Unable to verify credential: %(value)s, " %locals()
-        SfaFault.__init__(self, GENICODE.ERROR, faultString, extra)
+        faultString = "Unable to verify credential" %locals()
+        if value:
+            faultString += ": %s" % value
+        faultString += ", " 
+        SfaFault.__init__(self, GENICODE.BADARGS, faultString, extra)
     def __str__(self):
         return repr(self.value)