From fb099c9ef134166ecaf3905c0d8b2995245f3ded Mon Sep 17 00:00:00 2001 From: R David Murray Date: Tue, 19 Nov 2013 13:16:20 -0500 Subject: #19449: Handle non-string keys when generating 'fieldnames' error. csv was handling non-string keys fine except for the error message generated when a non-string key was not in 'fieldnames'. Fix by Tomas Grahn, full patch-with-test by Vajrasky Kok (tweaked slightly). --- Lib/test/test_csv.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'Lib/test/test_csv.py') diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index 976e6205b7..479ebd9bf2 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -570,6 +570,18 @@ class TestDictFields(unittest.TestCase): fileobj = StringIO() self.assertRaises(TypeError, csv.DictWriter, fileobj) + def test_write_fields_not_in_fieldnames(self): + with TemporaryFile("w+", newline='') as fileobj: + writer = csv.DictWriter(fileobj, fieldnames = ["f1", "f2", "f3"]) + # Of special note is the non-string key (issue 19449) + with self.assertRaises(ValueError) as cx: + writer.writerow({"f4": 10, "f2": "spam", 1: "abc"}) + exception = str(cx.exception) + self.assertIn("fieldnames", exception) + self.assertIn("'f4'", exception) + self.assertNotIn("'f2'", exception) + self.assertIn("1", exception) + def test_read_dict_fields(self): with TemporaryFile("w+") as fileobj: fileobj.write("1,2,abc\r\n") -- cgit v1.2.1