[Python-checkins] cpython (merge 3.5 -> default): Issue #19234: Merge from 3.5

[kushal.das]

https://hg.python.org/cpython/rev/3c745b656dca
changeset:   101700:3c745b656dca
parent:      101697:7fda2d76d947
parent:      101699:d83007ab69e2
user:        Kushal Das <kushaldas at gmail.com>
date:        Sat Jun 04 10:21:36 2016 -0700
summary:
  Issue #19234: Merge from 3.5

files:
  Doc/library/socket.rst |  5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -931,14 +931,13 @@
 
 .. 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

-- 
Repository URL: https://hg.python.org/cpython