diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2009-04-15 23:00:41 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2009-04-15 23:00:41 (GMT) |
| commit | 7cd8f2bea39159c3a4ab4b4c71b98944519a559c (patch) | |
| tree | deb6d5638a7c29c8c00e00acc0cc38635693c3ce /Doc | |
| parent | 0ec635138fc97e496407413878845fa5a7e37de4 (diff) | |
| download | cpython-7cd8f2bea39159c3a4ab4b4c71b98944519a559c.zip cpython-7cd8f2bea39159c3a4ab4b4c71b98944519a559c.tar.gz cpython-7cd8f2bea39159c3a4ab4b4c71b98944519a559c.tar.bz2 | |
Merged revisions 70873,70904,70934,71490,71553,71579 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70873 | josiah.carlson | 2009-03-31 15:32:34 -0400 (Tue, 31 Mar 2009) | 2 lines
This resolves issue 1161031. Tests pass.
........
r70904 | josiah.carlson | 2009-03-31 17:49:36 -0400 (Tue, 31 Mar 2009) | 3 lines
Made handle_expt_event() be called last, so that we don't accidentally read
after closing the socket.
........
r70934 | josiah.carlson | 2009-03-31 21:28:11 -0400 (Tue, 31 Mar 2009) | 2 lines
Fix for failing asyncore tests.
........
r71490 | r.david.murray | 2009-04-11 13:52:56 -0400 (Sat, 11 Apr 2009) | 4 lines
Make test_asyncore tests match code changes introduced by the
fix to Issue1161031, refactoring the test to simplify it in
the process.
........
r71553 | r.david.murray | 2009-04-12 21:06:46 -0400 (Sun, 12 Apr 2009) | 3 lines
Adjust test_asyncore to account for intentional asyncore behavior change
introduced by r70934 that was causing a test failure when run under -O.
........
r71579 | r.david.murray | 2009-04-13 12:56:32 -0400 (Mon, 13 Apr 2009) | 2 lines
Add missing NEWS item for issue1161031 fix.
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/asyncore.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/asyncore.rst b/Doc/library/asyncore.rst index 4736a9c..a2e1b5e 100644 --- a/Doc/library/asyncore.rst +++ b/Doc/library/asyncore.rst @@ -81,7 +81,8 @@ any that have been added to the map during asynchronous service) is closed. +----------------------+----------------------------------------+ | Event | Description | +======================+========================================+ - | ``handle_connect()`` | Implied by the first write event | + | ``handle_connect()`` | Implied by the first read or write | + | | event | +----------------------+----------------------------------------+ | ``handle_close()`` | Implied by a read event with no data | | | available | |