Fix logic problem in quoting=csv.QUOTE_ALL, quotechar=None check, add test.

diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
index a3c084306b7ea03c30d0f141401dd7e75924e6cb..ed10ed79a47614d496d40f971941ca3d8e3d8f4e 100644 (file)
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -32,6 +32,8 @@ class Test_Csv(unittest.TestCase):
         self.assertRaises(TypeError, ctor, arg, quoting=None)
         self.assertRaises(TypeError, ctor, arg, 
                           quoting=csv.QUOTE_ALL, quotechar='')
+        self.assertRaises(TypeError, ctor, arg, 
+                          quoting=csv.QUOTE_ALL, quotechar=None)
 
     def test_reader_arg_valid(self):
         self._test_arg_valid(csv.reader, [])

diff --git a/Modules/_csv.c b/Modules/_csv.c
index 30b7eca40901db97af2574b19b517c28169e3b29..c592933cb45e1edf48d749525e23dd5769467bde 100644 (file)
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -401,7 +401,7 @@ dialect_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
                 PyErr_SetString(PyExc_TypeError, "delimiter must be set");
                goto err;
        }
-       if (quotechar == Py_None && self->quoting != QUOTE_NONE)
+       if (quotechar == Py_None && quoting == NULL)
                self->quoting = QUOTE_NONE;
        if (self->quoting != QUOTE_NONE && self->quotechar == 0) {
                 PyErr_SetString(PyExc_TypeError,