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/library/csv.rst | |
| 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/library/csv.rst')
| -rw-r--r-- | Doc/library/csv.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst index 510d35a..e75f00a 100644 --- a/Doc/library/csv.rst +++ b/Doc/library/csv.rst @@ -50,9 +50,9 @@ The :mod:`csv` module defines the following functions: Return a reader object which will iterate over lines in the given *csvfile*. *csvfile* can be any object which supports the :term:`iterator` protocol and returns a - string each time its :meth:`!next` method is called --- file objects and list - objects are both suitable. If *csvfile* is a file object, it should be opened - with ``newline=''``. [#]_ An optional + string each time its :meth:`!next` method is called --- :term:`file objects + <file object>` and list objects are both suitable. If *csvfile* is a file object, + it should be opened with ``newline=''``. [#]_ An optional *dialect* parameter can be given which is used to define a set of parameters specific to a particular CSV dialect. It may be an instance of a subclass of the :class:`Dialect` class or one of the strings returned by the |