[Python-checkins] cpython (merge 3.4 -> 3.5): Merge 3.4 (issue #25605)

[victor.stinner]

https://hg.python.org/cpython/rev/cf69fe41f873
changeset:   99103:cf69fe41f873
branch:      3.5
parent:      99098:9cf274b2248e
parent:      99102:f82cd1ed659e
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Fri Nov 13 09:14:05 2015 +0100
summary:
  Merge 3.4 (issue #25605)

files:
  Doc/library/fcntl.rst |  4 ++++
  1 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/Doc/library/fcntl.rst b/Doc/library/fcntl.rst
--- a/Doc/library/fcntl.rst
+++ b/Doc/library/fcntl.rst
@@ -83,6 +83,8 @@
    buffer 1024 bytes long which is then passed to :func:`ioctl` and copied back
    into the supplied buffer.
 
+   If the :c:func:`ioctl` fails, an :exc:`IOError` exception is raised.
+
    An example::
 
       >>> import array, fcntl, struct, termios, os
@@ -104,6 +106,8 @@
    :manpage:`flock(2)` for details.  (On some systems, this function is emulated
    using :c:func:`fcntl`.)
 
+   If the :c:func:`flock` fails, an :exc:`IOError` exception is raised.
+
 
 .. function:: lockf(fd, cmd, len=0, start=0, whence=0)
 

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