X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fdummy%2Fdummyshell.py;h=67007d7ee7a67d06e8183e123a07684bebb9bbf4;hb=06768bd605e5d47fadfc90a35c74e30f267226a5;hp=c6cc833aef00cf7171662a3e086b75ea4bcccebd;hpb=1cc8e9613cab8b5b22478de369f259e591c54e6d;p=sfa.git diff --git a/sfa/dummy/dummyshell.py b/sfa/dummy/dummyshell.py index c6cc833a..67007d7e 100644 --- a/sfa/dummy/dummyshell.py +++ b/sfa/dummy/dummyshell.py @@ -1,9 +1,9 @@ import sys -import xmlrpclib import socket from urlparse import urlparse from sfa.util.sfalogging import logger +from sfa.util.py23 import xmlrpc_client class DummyShell: """ @@ -21,12 +21,12 @@ class DummyShell: def __init__ ( self, config ) : url = config.SFA_DUMMY_URL - self.proxy = xmlrpclib.Server(url, verbose = False, allow_none = True) + self.proxy = xmlrpc_client.ServerProxy(url, verbose = False, allow_none = True) def __getattr__(self, name): def func(*args, **kwds): if not name in DummyShell.direct_calls: - raise Exception, "Illegal method call %s for DUMMY driver"%(name) + raise Exception("Illegal method call %s for DUMMY driver"%(name)) result=getattr(self.proxy, name)(*args, **kwds) logger.debug('DummyShell %s returned ... '%(name)) return result