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

anmcn · anmcn · commit 5d45a8dc2247 · 2005-01-12T08:16:17.000Z
diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
@@ -32,6 +32,8 @@ def _test_arg_valid(self, ctor, arg):
         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
@@ -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, 

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ dialect_new(PyTypeObject type, PyObject args, PyObject *kwargs)`
`401`	`401`	`PyErr_SetString(PyExc_TypeError, "delimiter must be set");`
`402`	`402`	`goto err;`
`403`	`403`	`}`
`404`		`- if (quotechar == Py_None && self->quoting != QUOTE_NONE)`
	`404`	`+ if (quotechar == Py_None && quoting == NULL)`
`405`	`405`	`self->quoting = QUOTE_NONE;`
`406`	`406`	`if (self->quoting != QUOTE_NONE && self->quotechar == 0) {`
`407`	`407`	`PyErr_SetString(PyExc_TypeError,`