From: Benjamin Peterson Date: Fri, 10 Sep 2010 18:52:36 +0000 (+0000) Subject: Merged revisions 84677 via svnmerge from X-Git-Tag: v3.1.3rc1~253 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84c809be5ac34a7a7bf89285e42c9fb6b5f05065;p=thirdparty%2FPython%2Fcpython.git 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 ........ --- diff --git a/Doc/library/fcntl.rst b/Doc/library/fcntl.rst index e21c1eda7112..dd76d656bafa 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: