git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
deeper pass on xmlrpclib vs xmlrpc.client as well as configparser
[sfa.git]
/
sfa
/
util
/
faults.py
diff --git
a/sfa/util/faults.py
b/sfa/util/faults.py
index
f1d5cfd
..
702b685
100644
(file)
--- a/
sfa/util/faults.py
+++ b/
sfa/util/faults.py
@@
-24,14
+24,14
@@
# SFA API faults
#
# SFA API faults
#
-import xmlrpclib
from sfa.util.genicode import GENICODE
from sfa.util.genicode import GENICODE
+from sfa.util.py23 import xmlrpc_client
-class SfaFault(xmlrpc
lib
.Fault):
+class SfaFault(xmlrpc
_client
.Fault):
def __init__(self, faultCode, faultString, extra = None):
if extra:
faultString += ": " + str(extra)
def __init__(self, faultCode, faultString, extra = None):
if extra:
faultString += ": " + str(extra)
- xmlrpc
lib
.Fault.__init__(self, faultCode, faultString)
+ xmlrpc
_client
.Fault.__init__(self, faultCode, faultString)
class Forbidden(SfaFault):
def __init__(self, extra = None):
class Forbidden(SfaFault):
def __init__(self, extra = None):
@@
-98,7
+98,7
@@
class SfaNotImplemented(SfaFault):
class SfaAPIError(SfaFault):
def __init__(self, extra = None):
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):
SfaFault.__init__(self, GENICODE.SERVERERROR, faultString, extra)
class MalformedHrnException(SfaFault):
@@
-272,10
+272,10
@@
class SliverDoesNotExist(SfaFault):
def __str__(self):
return repr(self.value)
def __str__(self):
return repr(self.value)
-class BadRequestHash(xmlrpc
lib
.Fault):
+class BadRequestHash(xmlrpc
_client
.Fault):
def __init__(self, hash = None, extra = None):
faultString = "bad request hash: " + str(hash)
def __init__(self, hash = None, extra = None):
faultString = "bad request hash: " + str(hash)
- xmlrpc
lib
.Fault.__init__(self, GENICODE.ERROR, faultString)
+ xmlrpc
_client
.Fault.__init__(self, GENICODE.ERROR, faultString)
class MissingTrustedRoots(SfaFault):
def __init__(self, value, extra = None):
class MissingTrustedRoots(SfaFault):
def __init__(self, value, extra = None):