diff options
| author | ced <> | 2007-06-05 08:19:14 +0000 |
|---|---|---|
| committer | ced <> | 2007-06-05 08:19:14 +0000 |
| commit | b1a5b029a73dd2ac3d508dedcf33ab1e7c71bdcd (patch) | |
| tree | 9cdc751969e58c1f2b184f584d4c7f699bd999fa | |
| parent | fc1a75d2dec18874ea0387c13f0aa5d9ff2889b8 (diff) | |
KERNEL: fix compatibility for python2.5
bzr revid: ced-78889d847db53c5736858fd3c423d20e7ee23ba7
| -rw-r--r-- | bin/netsvc.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/bin/netsvc.py b/bin/netsvc.py index 03a931c3b92..d6e852d76cc 100644 --- a/bin/netsvc.py +++ b/bin/netsvc.py @@ -220,13 +220,11 @@ class GenericXMLRPCRequestHandler: raise xmlrpclib.Fault(s, tb_s) class SimpleXMLRPCRequestHandler(GenericXMLRPCRequestHandler, SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): - pass + SimpleXMLRPCServer.SimpleXMLRPCRequestHandler.rpc_paths = ('/xmlrpc/db', '/xmlrpc/common', '/xmlrpc/object', '/xmlrpc/report', '/xmlrpc/wizard') if HAS_SSL: class SecureXMLRPCRequestHandler(GenericXMLRPCRequestHandler, SecureXMLRPCServer.SecureXMLRPCRequestHandler): - pass -else: - pass + SecureXMLRPCServer.SecureXMLRPCRequestHandler.rpc_paths = ('/xmlrpc/db', '/xmlrpc/common', '/xmlrpc/object', '/xmlrpc/report', '/xmlrpc/wizard') class SimpleThreadedXMLRPCServer(SocketServer.ThreadingMixIn, SimpleXMLRPCServer.SimpleXMLRPCServer): def server_bind(self): @@ -256,10 +254,11 @@ class HttpDaemon(threading.Thread): def stop(self): self.running = False - if hasattr(socket, 'SHUT_RDWR'): - self.server.socket.shutdown(socket.SHUT_RDWR) - else: - self.server.socket.shutdown(2) + if os.name <> 'nt': + if hasattr(socket, 'SHUT_RDWR'): + self.server.socket.shutdown(socket.SHUT_RDWR) + else: + self.server.socket.shutdown(2) self.server.socket.close() def run(self): |