X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Fserver%2Fthreadedserver.py;fp=sfa%2Fserver%2Fthreadedserver.py;h=ae55c07e5f9bcd31adbd73783dff51d6c41161fb;hp=d5c47bf44565c0bda38748795aaf4edc17967212;hb=04acd3228e5911d36d0cd58dc35b9319fc558e17;hpb=e5537b113b6fe5874fdcd5b12414568500aa106c diff --git a/sfa/server/threadedserver.py b/sfa/server/threadedserver.py index d5c47bf4..ae55c07e 100644 --- a/sfa/server/threadedserver.py +++ b/sfa/server/threadedserver.py @@ -21,7 +21,7 @@ from sfa.util.config import Config from sfa.util.cache import Cache from sfa.trust.certificate import Certificate from sfa.trust.trustedroots import TrustedRoots -from sfa.util.py23 import xmlrpc_client +import xmlrpc.client # don't hard code an api class anymore here from sfa.generic import Generic @@ -207,7 +207,7 @@ class SecureXMLRPCServer(http.server.HTTPServer, xmlrpc.server.SimpleXMLRPCDispa # can't use format_exc() as it is not available in jython yet # (even in trunk). type, value, tb = sys.exc_info() - raise xmlrpc_client.Fault(1, ''.join( + raise xmlrpc.client.Fault(1, ''.join( traceback.format_exception(type, value, tb))) # override this one from the python 2.7 code