summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2015-03-30 08:50:00 (GMT)
committerLarry Hastings <larry@hastings.org>2015-03-30 08:50:00 (GMT)
commit09dab7a87eaa7115eeaf73016d65f2f835e25986 (patch)
tree04a83c1cfce64d3418a245feae7fee445e510949 /Doc
parent736240399e469a4134dac32a340feca5395baa28 (diff)
parent45cff0c0e6c4a31ed3b5b88ee803320862fbd43a (diff)
downloadcpython-09dab7a87eaa7115eeaf73016d65f2f835e25986.zip
cpython-09dab7a87eaa7115eeaf73016d65f2f835e25986.tar.gz
cpython-09dab7a87eaa7115eeaf73016d65f2f835e25986.tar.bz2
Merge 3.5.0a3 release engineering changes back into trunk.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/csv.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
index e7516b6..325a421 100644
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -419,7 +419,7 @@ Writer Objects
:class:`Writer` objects (:class:`DictWriter` instances and objects returned by
the :func:`writer` function) have the following public methods. A *row* must be
-a sequence of strings or numbers for :class:`Writer` objects and a dictionary
+an iterable of strings or numbers for :class:`Writer` objects and a dictionary
mapping fieldnames to strings or numbers (by passing them through :func:`str`
first) for :class:`DictWriter` objects. Note that complex numbers are written
out surrounded by parens. This may cause some problems for other programs which
@@ -431,6 +431,8 @@ read CSV files (assuming they support complex numbers at all).
Write the *row* parameter to the writer's file object, formatted according to
the current dialect.
+ .. versionchanged:: 3.5
+ Added support of arbitrary iterables.
.. method:: csvwriter.writerows(rows)