Merged revisions 84825-84826,84830 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84825 | antoine.pitrou | 2010-09-15 10:39:25 +0200 (mer., 15 sept. 2010) | 3 lines
Add a comment explaining why SocketIO is needed
........
r84826 | antoine.pitrou | 2010-09-15 11:32:45 +0200 (mer., 15 sept. 2010) | 3 lines
Improve docs for socket.makefile() and SocketIO
........
r84830 | antoine.pitrou | 2010-09-15 13:12:57 +0200 (mer., 15 sept. 2010) | 3 lines
Reverted unwanted change in r84826
........
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 618aa09..5314039 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -597,10 +597,9 @@
arguments are interpreted the same way as by the built-in :func:`open`
function.
- The returned file object references a :cfunc:`dup`\ ped version of the
- socket file descriptor, so the file object and socket object may be
- closed or garbage-collected independently. The socket must be in
- blocking mode (it can not have a timeout).
+ Closing the file object won't close the socket unless there are no
+ remaining references to the socket. The socket must be in blocking mode
+ (it can not have a timeout).
.. method:: socket.recv(bufsize[, flags])