[Python-checkins] r84678 - in python/branches/release31-maint: Doc/library/fcntl.rst

Fri Sep 10 20:52:37 CEST 2010

Author: benjamin.peterson
Date: Fri Sep 10 20:52:36 2010
New Revision: 84678
Log:
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 (2010年9月10日) | 1 line
 
 add reference to file object
........
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Doc/library/fcntl.rst
Modified: python/branches/release31-maint/Doc/library/fcntl.rst
==============================================================================

--- python/branches/release31-maint/Doc/library/fcntl.rst	(original)
+++ python/branches/release31-maint/Doc/library/fcntl.rst	Fri Sep 10 20:52:36 2010
@@ -16,8 +16,8 @@
 
 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:
 
