diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-15 11:25:11 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-15 11:25:11 (GMT) |
| commit | 25d535ea6a443f467eacfc9f487c90120972ca7f (patch) | |
| tree | 23feb014181a59162d9044813d8d562aee6885b6 /Doc/reference | |
| parent | ecbf2dea367b8dd971ccf4f3e3814afbb9ed5af9 (diff) | |
| download | cpython-25d535ea6a443f467eacfc9f487c90120972ca7f.zip cpython-25d535ea6a443f467eacfc9f487c90120972ca7f.tar.gz cpython-25d535ea6a443f467eacfc9f487c90120972ca7f.tar.bz2 | |
Merged revisions 84827-84829 via svnmerge from
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.
........
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/datamodel.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 25ab11e..3585ca7 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -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). |