From 900d5470470d342694e5e9b5cd133f0b0784b292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giampaolo=20Rodol=C3=A0?= Date: Fri, 11 Feb 2011 14:01:46 +0000 Subject: [PATCH] reverting r88395 and r88387 as per http://mail.python.org/pipermail/python-dev/2011-February/108005.html --- Lib/asyncore.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Lib/asyncore.py b/Lib/asyncore.py index 91c629bd0f3..a277bddc86a 100644 --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -218,9 +218,10 @@ def loop(timeout=30.0, use_poll=False, map=None, count=None): class dispatcher: + debug = False connected = False accepting = False - closed = False + closing = False addr = None ignore_log_types = frozenset(['warning']) @@ -393,16 +394,14 @@ class dispatcher: raise def close(self): - 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 + 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. @@ -545,6 +544,8 @@ class dispatcher_with_send(dispatcher): return (not self.connected) or len(self.out_buffer) def send(self, data): + if self.debug: + self.log_info('sending %s' % repr(data)) self.out_buffer = self.out_buffer + data self.initiate_send()