summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-04-09 09:32:58 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-04-09 09:32:58 (GMT)
commitd0d51542511239a2a4b34e6b465d003ccf856a9c (patch)
tree63474cc7023c2bc7b5b1f85e57a83ede86dc8eaf
parent705c0e38c2157b432edd33440c21298a12771c42 (diff)
downloadcpython-d0d51542511239a2a4b34e6b465d003ccf856a9c.zip
cpython-d0d51542511239a2a4b34e6b465d003ccf856a9c.tar.gz
cpython-d0d51542511239a2a4b34e6b465d003ccf856a9c.tar.bz2
Update fcntl doc: replace IOError with OSError
Issue #26716. IOError is a deprecated alias to OSError since Python 3.3.
-rw-r--r--Doc/library/fcntl.rst4
-rw-r--r--Modules/fcntlmodule.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/fcntl.rst b/Doc/library/fcntl.rst
index f8bb834..22f0f25 100644
--- a/Doc/library/fcntl.rst
+++ b/Doc/library/fcntl.rst
@@ -83,7 +83,7 @@ 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.
+ If the :c:func:`ioctl` fails, an :exc:`OSError` exception is raised.
An example::
@@ -106,7 +106,7 @@ 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.
+ If the :c:func:`flock` fails, an :exc:`OSError` exception is raised.
.. function:: lockf(fd, cmd, len=0, start=0, whence=0)
diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c
index 97ff07c..e61c930 100644
--- a/Modules/fcntlmodule.c
+++ b/Modules/fcntlmodule.c
@@ -344,7 +344,7 @@ of the following values:
When operation is LOCK_SH or LOCK_EX, it can also be bitwise ORed with
LOCK_NB to avoid blocking on lock acquisition. If LOCK_NB is used and the
-lock cannot be acquired, an IOError will be raised and the exception will
+lock cannot be acquired, an OSError will be raised and the exception will
have an errno attribute set to EACCES or EAGAIN (depending on the operating
system -- for portability, check for either value).