[Python-checkins] cpython (merge default -> default): merge heads

[giampaolo.rodola]

http://hg.python.org/cpython/rev/3b203f000256
changeset:   90496:3b203f000256
parent:      90495:2cceb8cb552b
parent:      90494:2502843dbedf
user:        Giampaolo Rodola' <g.rodola at gmail.com>
date:        Tue Apr 29 02:04:14 2014 +0200
summary:
  merge heads

files:
  Lib/test/test_csv.py |  10 ++++++++++
  Misc/ACKS            |   1 +
  2 files changed, 11 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -575,6 +575,16 @@
             fileobj.readline() # header
             self.assertEqual(fileobj.read(), "10,,abc\r\n")
 
+    def test_write_multiple_dict_rows(self):
+        fileobj = StringIO()
+        writer = csv.DictWriter(fileobj, fieldnames=["f1", "f2", "f3"])
+        writer.writeheader()
+        self.assertEqual(fileobj.getvalue(), "f1,f2,f3\r\n")
+        writer.writerows([{"f1": 1, "f2": "abc", "f3": "f"},
+                          {"f1": 2, "f2": 5, "f3": "xyz"}])
+        self.assertEqual(fileobj.getvalue(),
+                         "f1,f2,f3\r\n1,abc,f\r\n2,5,xyz\r\n")
+
     def test_write_no_fields(self):
         fileobj = StringIO()
         self.assertRaises(TypeError, csv.DictWriter, fileobj)
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -613,6 +613,7 @@
 Rajagopalasarma Jayakrishnan
 Zbigniew Jędrzejewski-Szmek
 Julien Jehannet
+Muhammad Jehanzeb
 Drew Jenkins
 Flemming Kjær Jensen
 Philip H. Jensen

-- 
Repository URL: http://hg.python.org/cpython