X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Ffaults.py;fp=sfa%2Futil%2Ffaults.py;h=f1d5cfd193fbe6a4f6470fe0f1780d84f1e5edde;hb=f8207350bb178150baf87829013ac6ce2ea3f39a;hp=1a4e92e977fb6b3ab05109ac68291d0d15ed55fb;hpb=41f6656a0919ba05dab6469a1fa0fd79a526c22e;p=sfa.git diff --git a/sfa/util/faults.py b/sfa/util/faults.py index 1a4e92e9..f1d5cfd1 100644 --- a/sfa/util/faults.py +++ b/sfa/util/faults.py @@ -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)