bpo-20028: Seperate the PR

corona10 · corona10 · commit 5680bff41430 · 2021-10-09T23:16:37.000+09:00
diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
@@ -899,12 +899,6 @@ class mydialect(csv.Dialect):
         self.assertEqual(str(cm.exception),
                          '"quotechar" must be string or None, not int')
 
-        mydialect.quotechar = ""
-        with self.assertRaises(csv.Error) as cm:
-            mydialect()
-        self.assertEqual(str(cm.exception),
-                         '"quotechar" must be a 1-character string')
-
     def test_delimiter(self):
         class mydialect(csv.Dialect):
             delimiter = ";"
@@ -957,10 +951,6 @@ class mydialect(csv.Dialect):
         d = mydialect()
         self.assertEqual(d.escapechar, "\\")
 
-        mydialect.escapechar = ""
-        with self.assertRaisesRegex(csv.Error, '"escapechar" must be a 1-character string'):
-            mydialect()
-
         mydialect.escapechar = "**"
         with self.assertRaisesRegex(csv.Error, '"escapechar" must be a 1-character string'):
             mydialect()
diff --git a/Misc/NEWS.d/next/Library/2021-10-03-21-14-37.bpo-20028.zBA4RK.rst b/Misc/NEWS.d/next/Library/2021-10-03-21-14-37.bpo-20028.zBA4RK.rst
@@ -1,2 +1,2 @@
-Update :mod:`csv` to handle the giving invalid quotechar correctly for
-initializing  *dialect*. Patch by Vajrasky Kok and Dong-hee Na.
+Improve error message of :class:`csv.Dialect` when initializing.
+Patch by Vajrasky Kok and Dong-hee Na.
diff --git a/Modules/_csv.c b/Modules/_csv.c
@@ -244,10 +244,7 @@ _set_char_or_none(const char *name, Py_UCS4 *target, PyObject *src, Py_UCS4 dflt
                 return -1;
             }
             Py_ssize_t len = PyUnicode_GetLength(src);
-            if (len < 0) {
-                return -1;
-            }
-            if (len != 1) {
+            if (len > 1) {
                 PyErr_Format(PyExc_TypeError,
                     "\"%s\" must be a 1-character string",
                     name);
@@ -277,10 +274,7 @@ _set_char(const char *name, Py_UCS4 *target, PyObject *src, Py_UCS4 dflt)
                 return -1;
         }
         Py_ssize_t len = PyUnicode_GetLength(src);
-        if (len < 0) {
-            return -1;
-        }
-        if (len != 1) {
+        if (len > 1) {
             PyErr_Format(PyExc_TypeError,
                          "\"%s\" must be a 1-character string",
                          name);
