From 42e0b7f47ef3bd1fe3b20ae253c9f660092d2fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giampaolo=20Rodol=C3=A0?= Date: Fri, 11 Feb 2011 13:04:18 +0000 Subject: asyncore: introduce a new 'closed' attribute to make sure that dispatcher gets closed only once. In different occasions close() might be called more than once, causing problems with already disconnected sockets/dispatchers. --- Lib/asyncore.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Lib/asyncore.py b/Lib/asyncore.py index f0712e2..91c629b 100644 --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -220,7 +220,7 @@ class dispatcher: connected = False accepting = False - closing = False + closed = False addr = None ignore_log_types = frozenset(['warning']) @@ -393,14 +393,16 @@ class dispatcher: raise def close(self): - self.connected = False - self.accepting = False - self.del_channel() - try: - self.socket.close() - except socket.error as why: - if why.args[0] not in (ENOTCONN, EBADF): - raise + if not self.closed: + self.closed = True + self.connected = False + self.accepting = False + self.del_channel() + try: + self.socket.close() + except socket.error as why: + if why.args[0] not in (ENOTCONN, EBADF): + raise # cheap inheritance, used to pass all other attribute # references to the underlying socket object. -- cgit v0.12