mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-13 12:17:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Issue #16026: Merge from 3.6

Browse source
This commit is contained in:
Berker Peksag 2017-01-07 09:33:28 +03:00
commit 412393d520
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Doc/library/csv.rst
View file

@ -146,7 +146,7 @@ The :mod:`csv` module defines the following functions:
The :mod:`csv` module defines the following classes: The :mod:`csv` module defines the following classes:
.. class:: DictReader(csvfile, fieldnames=None, restkey=None, restval=None, \ .. class:: DictReader(f, fieldnames=None, restkey=None, restval=None, \
dialect='excel', *args, **kwds) dialect='excel', *args, **kwds)
Create an object that operates like a regular reader but maps the Create an object that operates like a regular reader but maps the
@ -154,7 +154,7 @@ The :mod:`csv` module defines the following classes:
whose keys are given by the optional *fieldnames* parameter. whose keys are given by the optional *fieldnames* parameter.
The *fieldnames* parameter is a :term:`sequence`. If *fieldnames* is The *fieldnames* parameter is a :term:`sequence`. If *fieldnames* is
omitted, the values in the first row of the *csvfile* will be used as the omitted, the values in the first row of file *f* will be used as the
fieldnames. Regardless of how the fieldnames are determined, the ordered fieldnames. Regardless of how the fieldnames are determined, the ordered
dictionary preserves their original ordering. dictionary preserves their original ordering.
@ -184,14 +184,14 @@ The :mod:`csv` module defines the following classes:
OrderedDict([('first_name', 'John'), ('last_name', 'Cleese')]) OrderedDict([('first_name', 'John'), ('last_name', 'Cleese')])
.. class:: DictWriter(csvfile, fieldnames, restval='', extrasaction='raise', \ .. class:: DictWriter(f, fieldnames, restval='', extrasaction='raise', \
dialect='excel', *args, **kwds) dialect='excel', *args, **kwds)
Create an object which operates like a regular writer but maps dictionaries Create an object which operates like a regular writer but maps dictionaries
onto output rows. The *fieldnames* parameter is a :mod:`sequence onto output rows. The *fieldnames* parameter is a :mod:`sequence
<collections.abc>` of keys that identify the order in which values in the <collections.abc>` of keys that identify the order in which values in the
dictionary passed to the :meth:`writerow` method are written to the dictionary passed to the :meth:`writerow` method are written to file
*csvfile*. The optional *restval* parameter specifies the value to be *f*. The optional *restval* parameter specifies the value to be
written if the dictionary is missing a key in *fieldnames*. If the written if the dictionary is missing a key in *fieldnames*. If the
dictionary passed to the :meth:`writerow` method contains a key not found in dictionary passed to the :meth:`writerow` method contains a key not found in
*fieldnames*, the optional *extrasaction* parameter indicates what action to *fieldnames*, the optional *extrasaction* parameter indicates what action to
@ -205,7 +205,7 @@ The :mod:`csv` module defines the following classes:
Note that unlike the :class:`DictReader` class, the *fieldnames* parameter Note that unlike the :class:`DictReader` class, the *fieldnames* parameter
of the :class:`DictWriter` is not optional. Since Python's :class:`dict` of the :class:`DictWriter` is not optional. Since Python's :class:`dict`
objects are not ordered, there is not enough information available to deduce objects are not ordered, there is not enough information available to deduce
the order in which the row should be written to the *csvfile*. the order in which the row should be written to file *f*.
A short usage example:: A short usage example::