From: Georg Brandl <georg@python.org>
Date: Mon, 6 Oct 2014 14:36:20 +0000 (+0200)
Subject: Closes #14303: socket.makefile() does not call dup() anymore on the socket fd.
X-Git-Tag: v2.7.9rc1~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71ede5047de4d745c02175b94da03adcc8c00593;p=thirdparty%2FPython%2Fcpython.git

Closes #14303: socket.makefile() does not call dup() anymore on the socket fd.
---

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index f6c711e07c57..ce08a448abe0 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -661,9 +661,11 @@ correspond to Unix system calls applicable to sockets.
    .. index:: single: I/O control; buffering
 
    Return a :dfn:`file object` associated with the socket.  (File objects are
-   described in :ref:`bltin-file-objects`.) The file object
-   references a :c:func:`dup`\ ped version of the socket file descriptor, so the
-   file object and socket object may be closed or garbage-collected independently.
+   described in :ref:`bltin-file-objects`.) The file object does not close the
+   socket explicitly when its :meth:`close` method is called, but only removes
+   its reference to the socket object, so that the socket will be closed if it
+   is not referenced from anywhere else.
+
    The socket must be in blocking mode (it can not have a timeout). The optional
    *mode* and *bufsize* arguments are interpreted the same way as by the built-in
    :func:`file` function.