summaryrefslogtreecommitdiffstats
path: root/Doc/library/socket.rst
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-01-04 18:50:53 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-01-04 18:50:53 (GMT)
commit4adb288f4eaea3a21295c11a3ca49313d7da8cc7 (patch)
tree84821f5b594c91134847979997663ce070cbfc57 /Doc/library/socket.rst
parent6e40e27ecfe417ab4633c46b8ac99d30ebad6b36 (diff)
downloadcpython-4adb288f4eaea3a21295c11a3ca49313d7da8cc7.zip
cpython-4adb288f4eaea3a21295c11a3ca49313d7da8cc7.tar.gz
cpython-4adb288f4eaea3a21295c11a3ca49313d7da8cc7.tar.bz2
Issue #7631: Fix undefined references to the "built-in file object", which
has ceased to be.
Diffstat (limited to 'Doc/library/socket.rst')
-rw-r--r--Doc/library/socket.rst12
1 files changed, 7 insertions, 5 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index ec8ff3d..0fee6d5 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -575,14 +575,16 @@ 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
- :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). The optional
+ Return a :dfn:`file object` associated with the socket. The exact
+ returned type depends on the arguments given to :meth:`makefile`. These
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).
+
.. method:: socket.recv(bufsize[, flags])