Author: georg.brandl Date: Tue Dec 28 12:49:41 2010 New Revision: 87535 Log: #10739: document that on Windows, socket.makefile() does not make a file that has a true file descriptor usable where such a thing is expected. Modified: python/branches/py3k/Doc/ACKS.txt python/branches/py3k/Doc/library/socket.rst Modified: python/branches/py3k/Doc/ACKS.txt ============================================================================== --- python/branches/py3k/Doc/ACKS.txt (original) +++ python/branches/py3k/Doc/ACKS.txt Tue Dec 28 12:49:41 2010 @@ -111,6 +111,7 @@ * Andrew M. Kuchling * Dave Kuhlman * Erno Kuusela + * Ross Lagerwall * Thomas Lamb * Detlef Lannert * Piers Lauder Modified: python/branches/py3k/Doc/library/socket.rst ============================================================================== --- python/branches/py3k/Doc/library/socket.rst (original) +++ python/branches/py3k/Doc/library/socket.rst Tue Dec 28 12:49:41 2010 @@ -634,18 +634,24 @@ is system-dependent (usually 5). -.. method:: socket.makefile(mode='r', buffering=None, *, encoding=None, errors=None, newline=None) +.. method:: socket.makefile(mode='r', buffering=None, *, encoding=None, \ + errors=None, newline=None) .. index:: single: I/O control; buffering - Return a :term:`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. - - 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). + Return a :term:`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. + + 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). + + .. note:: + + On Windows, the file-like object created by :meth:`makefile` cannot be + used where a file object with a file descriptor is expected, such as the + stream arguments of :meth:`subprocess.Popen`. .. method:: socket.recv(bufsize[, flags])