diff options
| author | Georg Brandl <georg@python.org> | 2009-10-27 20:23:20 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-10-27 20:23:20 (GMT) |
| commit | 1e8cbe36cc2455296d38f927d1ab54b93d894881 (patch) | |
| tree | 2ed1df8c9dd684a27793897c2cf542cf0111e269 /Doc/library/socket.rst | |
| parent | cb7cb247b32acdd0816663d35ad51057a8571894 (diff) | |
| download | cpython-1e8cbe36cc2455296d38f927d1ab54b93d894881.zip cpython-1e8cbe36cc2455296d38f927d1ab54b93d894881.tar.gz cpython-1e8cbe36cc2455296d38f927d1ab54b93d894881.tar.bz2 | |
Merged revisions 75393,75416,75581,75609,75615 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r75393 | georg.brandl | 2009-10-13 18:55:12 +0200 (Di, 13 Okt 2009) | 1 line
Update module names in references in the FAQ.
................
r75416 | georg.brandl | 2009-10-14 20:46:15 +0200 (Mi, 14 Okt 2009) | 1 line
#7129: add missing function.
................
r75581 | georg.brandl | 2009-10-21 09:17:48 +0200 (Mi, 21 Okt 2009) | 9 lines
Merged revisions 75580 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75580 | georg.brandl | 2009-10-21 09:15:59 +0200 (Mi, 21 Okt 2009) | 1 line
#7170: fix explanation about non-weakrefable builtin types.
........
................
r75609 | georg.brandl | 2009-10-22 17:16:26 +0200 (Do, 22 Okt 2009) | 1 line
#7137: fix makefile() documentation to match the new parameters.
................
r75615 | georg.brandl | 2009-10-22 18:08:10 +0200 (Do, 22 Okt 2009) | 1 line
#6927: fix wrong word.
................
Diffstat (limited to 'Doc/library/socket.rst')
| -rw-r--r-- | Doc/library/socket.rst | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index e6ad578..292ea2d 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -565,17 +565,17 @@ correspond to Unix system calls applicable to sockets. is system-dependent (usually 5). -.. method:: socket.makefile([mode[, bufsize]]) +.. method:: socket.makefile(mode='r', buffering=None, *, encoding=None, newline=None) .. 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 - *mode* and *bufsize* arguments are interpreted the same way as by the built-in - :func:`file` function. + 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 + arguments are interpreted the same way as by the built-in :func:`open` + function. .. method:: socket.recv(bufsize[, flags]) |