From c843e6a8c216f7630952e71a6862605deec7b162 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Thu, 18 Dec 2008 20:18:26 +0100 Subject: [PATCH] [REF] Refactoring bzr revid: stephane@tinyerp.com-20081218191826-9s3ubtahbnj120eq --- bin/netsvc.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/bin/netsvc.py b/bin/netsvc.py index 8e74b9346a9..3edf977624f 100644 --- a/bin/netsvc.py +++ b/bin/netsvc.py @@ -263,7 +263,6 @@ class GenericXMLRPCRequestHandler: def _dispatch(self, method, params): import traceback - traceback.print_stack() try: self.log('method', method) self.log('params', params) @@ -337,16 +336,11 @@ class HttpDaemon(threading.Thread): def stop(self): self.running = False if os.name != 'nt': - if hasattr(socket, 'SHUT_RDWR'): - if self.secure: - self.server.socket.sock_shutdown(socket.SHUT_RDWR) - else: - self.server.socket.shutdown(socket.SHUT_RDWR) + value = hasattr(socket, 'SHUT_RDWR') and socket.SHUT_RDWR or 2 + if self.secure: + self.server.socket.sock_shutdown(value) else: - if self.secure: - self.server.socket.sock_shutdown(2) - else: - self.server.socket.shutdown(2) + self.server.socket.shutdown(value) self.server.socket.close() def run(self):