[Python-3000-checkins] r64770 - in python/branches/py3k/Lib: asynchat.py asyncore.py test/test_asyncore.py
josiah.carlson
python-3000-checkins at python.org
Mon Jul 7 07:04:12 CEST 2008
Author: josiah.carlson
Date: Mon Jul 7 07:04:12 2008
New Revision: 64770
Log:
Fixed bugs 760475, 953599, and 1519. This is a translation of changelist 64768
to the py3k branch.
Modified:
python/branches/py3k/Lib/asynchat.py
python/branches/py3k/Lib/asyncore.py
python/branches/py3k/Lib/test/test_asyncore.py
Modified: python/branches/py3k/Lib/asynchat.py
==============================================================================
--- python/branches/py3k/Lib/asynchat.py (original)
+++ python/branches/py3k/Lib/asynchat.py Mon Jul 7 07:04:12 2008
@@ -77,7 +77,7 @@
use_encoding = 0
encoding = 'latin1'
- def __init__ (self, conn=None):
+ def __init__ (self, sock=None, map=None):
# for string terminator matching
self.ac_in_buffer = b''
@@ -92,7 +92,7 @@
# we toss the use of the "simple producer" and replace it with
# a pure deque, which the original fifo was a wrapping of
self.producer_fifo = deque()
- asyncore.dispatcher.__init__ (self, conn)
+ asyncore.dispatcher.__init__ (self, sock, map)
def collect_incoming_data(self, data):
raise NotImplementedError("must be implemented in subclass")
Modified: python/branches/py3k/Lib/asyncore.py
==============================================================================
--- python/branches/py3k/Lib/asyncore.py (original)
+++ python/branches/py3k/Lib/asyncore.py Mon Jul 7 07:04:12 2008
@@ -98,8 +98,10 @@
obj.handle_read_event()
if flags & select.POLLOUT:
obj.handle_write_event()
- if flags & (select.POLLERR | select.POLLHUP | select.POLLNVAL):
+ if flags & (select.POLLERR | select.POLLNVAL):
obj.handle_expt_event()
+ if flags & select.POLLHUP:
+ obj.handle_close_event()
except (ExitNow, KeyboardInterrupt, SystemExit):
raise
except:
@@ -466,7 +468,7 @@
),
'error'
)
- self.close()
+ self.handle_close()
def handle_expt(self):
self.log_info('unhandled exception', 'warning')
Modified: python/branches/py3k/Lib/test/test_asyncore.py
==============================================================================
--- python/branches/py3k/Lib/test/test_asyncore.py (original)
+++ python/branches/py3k/Lib/test/test_asyncore.py Mon Jul 7 07:04:12 2008
@@ -39,6 +39,7 @@
raise asyncore.ExitNow()
handle_write_event = handle_read_event
+ handle_close_event = handle_read_event
handle_expt_event = handle_read_event
class crashingdummy:
@@ -49,6 +50,7 @@
raise Exception()
handle_write_event = handle_read_event
+ handle_close_event = handle_read_event
handle_expt_event = handle_read_event
def handle_error(self):
@@ -118,6 +120,7 @@
def __init__(self):
self.read = False
self.write = False
+ self.closed = False
self.expt = False
def handle_read_event(self):
@@ -126,6 +129,9 @@
def handle_write_event(self):
self.write = True
+ def handle_close_event(self):
+ self.closed = True
+
def handle_expt_event(self):
self.expt = True
@@ -168,9 +174,9 @@
for flag in (select.POLLERR, select.POLLHUP, select.POLLNVAL):
tobj = testobj()
- self.assertEqual(tobj.expt, False)
+ self.assertEqual((tobj.expt, tobj.closed)[flag == select.POLLHUP], False)
asyncore.readwrite(tobj, flag)
- self.assertEqual(tobj.expt, True)
+ self.assertEqual((tobj.expt, tobj.closed)[flag == select.POLLHUP], True)
# check that ExitNow exceptions in the object handler method
# bubbles all the way up through asyncore readwrite calls
More information about the Python-3000-checkins
mailing list