X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Ffaults.py;fp=sfa%2Futil%2Ffaults.py;h=702b685dd134805544ac70fdd49b4f31abbc62e6;hb=06768bd605e5d47fadfc90a35c74e30f267226a5;hp=7299f27d63eb6d1ac5cbc3157094a5ecea68488a;hpb=24e34365889f45eda036c974816ec6e9f5ebab09;p=sfa.git

diff --git a/sfa/util/faults.py b/sfa/util/faults.py
index 7299f27d..702b685d 100644
--- a/sfa/util/faults.py
+++ b/sfa/util/faults.py
@@ -24,18 +24,14 @@
 # SFA API faults
 #
 
-try:
-    from xmlrpc.client import Fault as xmlrpcFault
-except:
-    from xmlrpclib import Fault as xmlrpcFault
-    
 from sfa.util.genicode import GENICODE
+from sfa.util.py23 import xmlrpc_client
 
-class SfaFault(xmlrpcFault):
+class SfaFault(xmlrpc_client.Fault):
     def __init__(self, faultCode, faultString, extra = None):
         if extra:
             faultString += ": " + str(extra)
-        xmlrpcFault.__init__(self, faultCode, faultString)
+        xmlrpc_client.Fault.__init__(self, faultCode, faultString)
 
 class Forbidden(SfaFault):
     def __init__(self,  extra = None):
@@ -276,10 +272,10 @@ class SliverDoesNotExist(SfaFault):
     def __str__(self):
         return repr(self.value)
 
-class BadRequestHash(xmlrpcFault):
+class BadRequestHash(xmlrpc_client.Fault):
     def __init__(self, hash = None, extra = None):
         faultString = "bad request hash: " + str(hash)
-        xmlrpcFault.__init__(self, GENICODE.ERROR, faultString)
+        xmlrpc_client.Fault.__init__(self, GENICODE.ERROR, faultString)
 
 class MissingTrustedRoots(SfaFault):
     def __init__(self, value, extra = None):