mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 84827-84829 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84827 | antoine.pitrou | 2010-09-15 11:58:26 +0200 (mer., 15 sept. 2010) | 3 lines

  Add a glossary entry for file objects.
........
  r84828 | antoine.pitrou | 2010-09-15 12:08:31 +0200 (mer., 15 sept. 2010) | 3 lines

  Update file-related information in the FAQ.
........
  r84829 | antoine.pitrou | 2010-09-15 13:11:28 +0200 (mer., 15 sept. 2010) | 3 lines

  Add cross-references to the glossary entry for file objects.
........
This commit is contained in:
Antoine Pitrou 2010-09-15 11:25:11 +00:00
parent ecbf2dea36
commit 25d535ea6a
37 changed files with 218 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Doc/reference/datamodel.rst
View file

@ -781,9 +781,9 @@ I/O objects (also known as file objects)
single: stdout (in module sys)
single: stderr (in module sys)
A file object represents an open file. Various shortcuts are available
to create file objects: the :func:`open` built-in function, and also
:func:`os.popen`, :func:`os.fdopen`, and the :meth:`makefile` method
A :term:`file object` represents an open file. Various shortcuts are
available to create file objects: the :func:`open` built-in function, and
also :func:`os.popen`, :func:`os.fdopen`, and the :meth:`makefile` method
of socket objects (and perhaps by other functions or methods provided
by extension modules).