summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-09-10 18:52:36 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-09-10 18:52:36 (GMT)
commit84c809be5ac34a7a7bf89285e42c9fb6b5f05065 (patch)
tree3b283cbe2f91ee56c05404d746f1650741da79ba
parent5ea2828c663855453abdb958575595a427a5a88e (diff)
downloadcpython-84c809be5ac34a7a7bf89285e42c9fb6b5f05065.zip
cpython-84c809be5ac34a7a7bf89285e42c9fb6b5f05065.tar.gz
cpython-84c809be5ac34a7a7bf89285e42c9fb6b5f05065.tar.bz2
Merged revisions 84677 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84677 | benjamin.peterson | 2010-09-10 13:50:38 -0500 (Fri, 10 Sep 2010) | 1 line add reference to file object ........
-rw-r--r--Doc/library/fcntl.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/fcntl.rst b/Doc/library/fcntl.rst
index e21c1ed..dd76d65 100644
--- a/Doc/library/fcntl.rst
+++ b/Doc/library/fcntl.rst
@@ -16,8 +16,8 @@ interface to the :cfunc:`fcntl` and :cfunc:`ioctl` Unix routines.
All functions in this module take a file descriptor *fd* as their first
argument. This can be an integer file descriptor, such as returned by
-``sys.stdin.fileno()``, or a file object, such as ``sys.stdin`` itself, which
-provides a :meth:`fileno` which returns a genuine file descriptor.
+``sys.stdin.fileno()``, or a :class:`io.IOBase` object, such as ``sys.stdin``
+itself, which provides a :meth:`fileno` that returns a genuine file descriptor.
The module defines the following functions: