summaryrefslogtreecommitdiffstats
path: root/Doc/library/array.rst
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-09-15 11:25:11 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-09-15 11:25:11 (GMT)
commit25d535ea6a443f467eacfc9f487c90120972ca7f (patch)
tree23feb014181a59162d9044813d8d562aee6885b6 /Doc/library/array.rst
parentecbf2dea367b8dd971ccf4f3e3814afbb9ed5af9 (diff)
downloadcpython-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/library/array.rst')
-rw-r--r--Doc/library/array.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/array.rst b/Doc/library/array.rst
index 2235f08..3f5f9e6 100644
--- a/Doc/library/array.rst
+++ b/Doc/library/array.rst
@@ -138,11 +138,11 @@ The following data items and methods are also supported:
.. method:: array.fromfile(f, n)
- Read *n* items (as machine values) from the file object *f* and append them to
- the end of the array. If less than *n* items are available, :exc:`EOFError` is
- raised, but the items that were available are still inserted into the array.
- *f* must be a real built-in file object; something else with a :meth:`read`
- method won't do.
+ Read *n* items (as machine values) from the :term:`file object` *f* and append
+ them to the end of the array. If less than *n* items are available,
+ :exc:`EOFError` is raised, but the items that were available are still
+ inserted into the array. *f* must be a real built-in file object; something
+ else with a :meth:`read` method won't do.
.. method:: array.fromlist(list)
@@ -196,7 +196,7 @@ The following data items and methods are also supported:
.. method:: array.tofile(f)
- Write all items (as machine values) to the file object *f*.
+ Write all items (as machine values) to the :term:`file object` *f*.
.. method:: array.tolist()