From 5d45a8dc2247d6d9f59e57d7719c3d467dd3b40d Mon Sep 17 00:00:00 2001 From: Andrew McNamara Date: Wed, 12 Jan 2005 08:16:17 +0000 Subject: [PATCH] Fix logic problem in quoting=csv.QUOTE_ALL, quotechar=None check, add test. --- Lib/test/test_csv.py | 2 ++ Modules/_csv.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index a3c084306b7..ed10ed79a47 100644 --- 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 30b7eca4090..c592933cb45 100644 --- 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,