Merge 3.4 (issue #25605)

This commit is contained in:
Victor Stinner 2015-11-13 09:14:05 +01:00
commit 33be3e3d5b
1 changed files with 4 additions and 0 deletions

View File

@ -83,6 +83,8 @@ The module defines the following functions:
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 @@ The module defines the following functions:
: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)