[Python-checkins] r78388 - in python/branches/py3k: Doc/library/csv.rst Lib/csv.py Lib/test/test_csv.py Misc/NEWS
r.david.murray
python-checkins at python.org
Tue Feb 23 23:57:58 CET 2010
Author: r.david.murray
Date: Tue Feb 23 23:57:58 2010
New Revision: 78388
Log:
Merged revisions 78384 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78384 | dirkjan.ochtman | 2010-02-23 16:09:52 -0500 (Tue, 23 Feb 2010) | 4 lines
Fix #1537721: add writeheader() method to csv.DictWriter.
Reviewed by skip.montanaro and thomas.wouters.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Doc/library/csv.rst
python/branches/py3k/Lib/csv.py
python/branches/py3k/Lib/test/test_csv.py
python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Doc/library/csv.rst
==============================================================================
--- python/branches/py3k/Doc/library/csv.rst (original)
+++ python/branches/py3k/Doc/library/csv.rst Tue Feb 23 23:57:58 2010
@@ -392,6 +392,16 @@
A read-only description of the dialect in use by the writer.
+DictWriter objects have the following public method:
+
+
+.. method:: DictWriter.writeheader()
+
+ Write a row with the field names (as specified in the constructor).
+
+ .. versionadded:: 2.7
+
+
.. _csv-examples:
Examples
Modified: python/branches/py3k/Lib/csv.py
==============================================================================
--- python/branches/py3k/Lib/csv.py (original)
+++ python/branches/py3k/Lib/csv.py Tue Feb 23 23:57:58 2010
@@ -127,6 +127,10 @@
self.extrasaction = extrasaction
self.writer = writer(f, dialect, *args, **kwds)
+ def writeheader(self):
+ header = dict(zip(self.fieldnames, self.fieldnames))
+ self.writerow(header)
+
def _dict_to_list(self, rowdict):
if self.extrasaction == "raise":
wrong_fields = [k for k in rowdict if k not in self.fieldnames]
Modified: python/branches/py3k/Lib/test/test_csv.py
==============================================================================
--- python/branches/py3k/Lib/test/test_csv.py (original)
+++ python/branches/py3k/Lib/test/test_csv.py Tue Feb 23 23:57:58 2010
@@ -535,8 +535,12 @@
def test_write_simple_dict(self):
with TemporaryFile("w+", newline='') as fileobj:
writer = csv.DictWriter(fileobj, fieldnames = ["f1", "f2", "f3"])
+ writer.writeheader()
+ fileobj.seek(0)
+ self.assertEqual(fileobj.readline(), "f1,f2,f3\r\n")
writer.writerow({"f1": 10, "f3": "abc"})
fileobj.seek(0)
+ fileobj.readline() # header
self.assertEqual(fileobj.read(), "10,,abc\r\n")
def test_write_no_fields(self):
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Tue Feb 23 23:57:58 2010
@@ -254,6 +254,8 @@
Library
-------
+- Issue #1537721: Add a writeheader() method to csv.DictWriter.
+
- Issue #7959: ctypes callback functions are now registered correctly
with the cylce garbage collector.
More information about the Python-checkins
mailing list