X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfa%2Futil%2Ffaults.py;h=f1d5cfd193fbe6a4f6470fe0f1780d84f1e5edde;hb=b15b1d2107ffff749137078fc7fc386d5424f3f9;hp=e46b986ce591e386f1cc369d097414b1798377a3;hpb=cc1a4f343944d8468e66d83f408b4ff2b8fae01a;p=sfa.git

diff --git a/sfa/util/faults.py b/sfa/util/faults.py
index e46b986c..f1d5cfd1 100644
--- a/sfa/util/faults.py
+++ b/sfa/util/faults.py
@@ -35,9 +35,15 @@ 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"
+        SfaFault.__init__(self, GENICODE.BADARGS, faultString, extra)
+
+
 class CredentialMismatch(SfaFault):
     def __init__(self,  extra = None):
         faultString = "Credential mismatch"
@@ -323,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)
 
@@ -335,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)