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
remove py23 compat layer
[sfa.git]
/
sfa
/
util
/
faults.py
diff --git
a/sfa/util/faults.py
b/sfa/util/faults.py
index
ea62bad
..
07ec10d
100644
(file)
--- a/
sfa/util/faults.py
+++ b/
sfa/util/faults.py
@@
-25,15
+25,15
@@
#
from sfa.util.genicode import GENICODE
#
from sfa.util.genicode import GENICODE
-
from sfa.util.py23 import xmlrpc_
client
+
import xmlrpc.
client
-class SfaFault(xmlrpc
_
client.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
_
client.Fault.__init__(self, faultCode, faultString)
+ xmlrpc
.
client.Fault.__init__(self, faultCode, faultString)
class Forbidden(SfaFault):
class Forbidden(SfaFault):
@@
-360,11
+360,11
@@
class SliverDoesNotExist(SfaFault):
return repr(self.value)
return repr(self.value)
-class BadRequestHash(xmlrpc
_
client.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
_
client.Fault.__init__(self, GENICODE.ERROR, faultString)
+ xmlrpc
.
client.Fault.__init__(self, GENICODE.ERROR, faultString)
class MissingTrustedRoots(SfaFault):
class MissingTrustedRoots(SfaFault):