diff options
| author | Kushal Das <kushaldas@gmail.com> | 2016-06-04 17:21:36 (GMT) |
|---|---|---|
| committer | Kushal Das <kushaldas@gmail.com> | 2016-06-04 17:21:36 (GMT) |
| commit | c79b06c35cf3a14ec1cc8aa254f4ffe64438179f (patch) | |
| tree | 4e6e2f34ff2792491b3e807ed7c349a35109e69c /Doc/library/socket.rst | |
| parent | 7a3827f61f8d3875bd2611aee5f5a5e5e2913907 (diff) | |
| parent | 89beb27061178e3cdb2d249b3719e4f35234db48 (diff) | |
| download | cpython-c79b06c35cf3a14ec1cc8aa254f4ffe64438179f.zip cpython-c79b06c35cf3a14ec1cc8aa254f4ffe64438179f.tar.gz cpython-c79b06c35cf3a14ec1cc8aa254f4ffe64438179f.tar.bz2 | |
Issue #19234: Merge from 3.5
Diffstat (limited to 'Doc/library/socket.rst')
| -rw-r--r-- | Doc/library/socket.rst | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index ceb72b7..0d52d82 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -931,14 +931,13 @@ to sockets. .. method:: socket.fileno() - Return the socket's file descriptor (a small integer). This is useful with - :func:`select.select`. + Return the socket's file descriptor (a small integer), or -1 on failure. This + is useful with :func:`select.select`. 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 this limitation. - .. method:: socket.get_inheritable() Get the :ref:`inheritable flag <fd_inheritance>` of the socket's file |