From: Skip Montanaro <skip@pobox.com>
Date: Sat, 6 Sep 2003 19:52:28 +0000 (+0000)
Subject: **kwds arg was missing from __init__ for Dict{Reader,Writer} classes.
X-Git-Tag: v2.3.1~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b7a9fd7d29f4131ae26981d33b75f4833c62399;p=thirdparty%2FPython%2Fcpython.git

**kwds arg was missing from __init__ for Dict{Reader,Writer} classes.
---

diff --git a/Lib/csv.py b/Lib/csv.py
index 37b9e16c31aa..fe015fc50b4c 100644
--- a/Lib/csv.py
+++ b/Lib/csv.py
@@ -93,11 +93,11 @@ register_dialect("excel-tab", excel_tab)
 
 class DictReader:
     def __init__(self, f, fieldnames, restkey=None, restval=None,
-                 dialect="excel", *args):
+                 dialect="excel", *args, **kwds):
         self.fieldnames = fieldnames    # list of keys for the dict
         self.restkey = restkey          # key to catch long rows
         self.restval = restval          # default value for short rows
-        self.reader = reader(f, dialect, *args)
+        self.reader = reader(f, dialect, *args, **kwds)
 
     def __iter__(self):
         return self
@@ -122,7 +122,7 @@ class DictReader:
 
 class DictWriter:
     def __init__(self, f, fieldnames, restval="", extrasaction="raise",
-                 dialect="excel", *args):
+                 dialect="excel", *args, **kwds):
         self.fieldnames = fieldnames    # list of keys for the dict
         self.restval = restval          # for writing short dicts
         if extrasaction.lower() not in ("raise", "ignore"):
@@ -130,7 +130,7 @@ class DictWriter:
                   ("extrasaction (%s) must be 'raise' or 'ignore'" %
                    extrasaction)
         self.extrasaction = extrasaction
-        self.writer = writer(f, dialect, *args)
+        self.writer = writer(f, dialect, *args, **kwds)
 
     def _dict_to_list(self, rowdict):
         if self.extrasaction == "raise":
diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
index ba7cc091b1c6..d85c5b6cb39d 100644
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -447,6 +447,13 @@ class TestDictFields(unittest.TestCase):
         self.assertEqual(reader.next(), {"1": '1', "2": '2', "3": 'abc',
                                          "4": '4', "5": '5', "6": '6'})
 
+    def test_read_semi_sep(self):
+        reader = csv.DictReader(["1;2;abc;4;5;6\r\n"],
+                                fieldnames="1 2 3 4 5 6".split(),
+                                delimiter=';')
+        self.assertEqual(reader.next(), {"1": '1', "2": '2', "3": 'abc',
+                                         "4": '4', "5": '5', "6": '6'})
+
 class TestArrayWrites(unittest.TestCase):
     def test_int_write(self):
         import array
diff --git a/Misc/NEWS b/Misc/NEWS
index 36e3237c2c52..77ad0edd9a91 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -47,6 +47,9 @@ Extension modules
 Library
 -------
 
+- The csv module's DictReader and DictWriter classes now accept keyword
+  arguments.  This was an omission in the initial implementation.
+
 - Bug #453515:  filecmp.dircmp() can now make case insensitive
   filename comparisons.