Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #19234: Merge from 3.5

This commit is contained in:
Kushal Das 2016-06-04 10:21:36 -07:00
parent 7a3827f61f 89beb27061
commit c79b06c35c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Doc/library/socket.rst
View File

@ -931,14 +931,13 @@ to sockets.
.. method:: socket.fileno() .. method:: socket.fileno()
Return the socket's file descriptor (a small integer). This is useful with Return the socket's file descriptor (a small integer), or -1 on failure. This
:func:`select.select`. is useful with :func:`select.select`.
Under Windows the small integer returned by this method cannot be used where a Under Windows the small integer returned by this method cannot be used where a
file descriptor can be used (such as :func:`os.fdopen`). Unix does not have file descriptor can be used (such as :func:`os.fdopen`). Unix does not have
this limitation. this limitation.
.. method:: socket.get_inheritable() .. method:: socket.get_inheritable()
Get the :ref:`inheritable flag <fd_inheritance>` of the socket's file Get the :ref:`inheritable flag <fd_inheritance>` of the socket's file