summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-04-12 15:35:44 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-04-12 15:35:44 (GMT)
commit78532baeabc4234e3894c775f2bb7e0a21c12e0e (patch)
tree338d668a07b6ffc4f09abeac709b47881cc157ee /Doc
parent12f6a997e86a8dddefa3d9d0399aee73db4a8672 (diff)
downloadcpython-78532baeabc4234e3894c775f2bb7e0a21c12e0e.zip
cpython-78532baeabc4234e3894c775f2bb7e0a21c12e0e.tar.gz
cpython-78532baeabc4234e3894c775f2bb7e0a21c12e0e.tar.bz2
Merged revisions 70873,70904,70934,71490 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. ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/asyncore.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/asyncore.rst b/Doc/library/asyncore.rst
index 40dc812..267c58b 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 |