diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2011-06-20 01:23:17 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2011-06-20 01:23:17 (GMT) |
| commit | d6b3840e7d8cce39996d365a8fd05a7849cbef63 (patch) | |
| tree | f9fca8506f47e3727e7c9cbfdddc9472669db68b /Doc/library | |
| parent | 52810a57f3eeefbd1bd74b8810cb41c1e0b19bb5 (diff) | |
| parent | 656df5ec3eaf879980b8587e30831612de9d049f (diff) | |
| download | cpython-d6b3840e7d8cce39996d365a8fd05a7849cbef63.zip cpython-d6b3840e7d8cce39996d365a8fd05a7849cbef63.tar.gz cpython-d6b3840e7d8cce39996d365a8fd05a7849cbef63.tar.bz2 | |
merge from 3.2
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/asyncore.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/asyncore.rst b/Doc/library/asyncore.rst index 31c1aa1..5411c30 100644 --- a/Doc/library/asyncore.rst +++ b/Doc/library/asyncore.rst @@ -157,8 +157,8 @@ any that have been added to the map during asynchronous service) is closed. Called on listening channels (passive openers) when a connection has been established with a new remote endpoint that has issued a :meth:`connect` - call for the local endpoint. *conn* is a *new* socket object usable to - send and receive data on the connection, and *address* is the address + call for the local endpoint. *sock* is a *new* socket object usable to + send and receive data on the connection, and *addr* is the address bound to the socket on the other end of the connection. .. versionadded:: 3.2 |