From eca47ce8b65fb2e3bc857f81fa7cb32b301fcf61 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sun, 3 Jan 2010 15:14:57 +0100 Subject: [PATCH] [imp] replace hasattr usages with getattr in socket shutdowns bzr revid: xmo@tinyerp.com-20100103141457-uff2ss505npnkoti --- bin/service/http_server.py | 2 +- bin/service/netrpc_server.py | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/bin/service/http_server.py b/bin/service/http_server.py index 72dd787533c..2f608a56b95 100644 --- a/bin/service/http_server.py +++ b/bin/service/http_server.py @@ -137,7 +137,7 @@ class BaseHttpDaemon(threading.Thread, netsvc.Server): if os.name != 'nt': try: self.server.socket.shutdown( - hasattr(socket, 'SHUT_RDWR') and socket.SHUT_RDWR or 2) + getattr(socket, 'SHUT_RDWR', 2) except socket.error, e: if e.errno != 57: raise # OSX, socket shutdowns both sides if any side closes it diff --git a/bin/service/netrpc_server.py b/bin/service/netrpc_server.py index 50e9b5e7a9b..6260ec3d0e5 100644 --- a/bin/service/netrpc_server.py +++ b/bin/service/netrpc_server.py @@ -42,10 +42,8 @@ class TinySocketClientThread(threading.Thread, netsvc.OpenERPDispatcher): def __del__(self): if self.sock: try: - if hasattr(socket, 'SHUT_RDWR'): - self.socket.shutdown(socket.SHUT_RDWR) - else: - self.socket.shutdown(2) + self.socket.shutdown( + getattr(socket, 'SHUT_RDWR', 2)) except: pass # That should garbage-collect and close it, too self.sock = None @@ -131,10 +129,8 @@ class TinySocketServerThread(threading.Thread,netsvc.Server): for t in self.threads: t.stop() try: - if hasattr(socket, 'SHUT_RDWR'): - self.socket.shutdown(socket.SHUT_RDWR) - else: - self.socket.shutdown(2) + self.socket.shutdown( + getattr(socket, 'SHUT_RDWR', 2)) self.socket.close() except: return False