diff options
| author | Dong-hee Na <donghee.na@python.org> | 2021-10-11 11:08:15 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 11:08:15 (GMT) |
| commit | ab62051152cb24470056ffaeb9107c8b4311375e (patch) | |
| tree | bd0e260c6e68911c50f6483233f183a2e0b14df4 /Modules | |
| parent | d74da9e140441135a4eddaef9a37f00f32579038 (diff) | |
| download | cpython-ab62051152cb24470056ffaeb9107c8b4311375e.zip cpython-ab62051152cb24470056ffaeb9107c8b4311375e.tar.gz cpython-ab62051152cb24470056ffaeb9107c8b4311375e.tar.bz2 | |
bpo-20028: Empty escapechar/quotechar is not allowed for csv.Dialect (GH-28833)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_csv.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Modules/_csv.c b/Modules/_csv.c index 469c1a1..1c2f504 100644 --- a/Modules/_csv.c +++ b/Modules/_csv.c @@ -250,16 +250,14 @@ _set_char_or_none(const char *name, Py_UCS4 *target, PyObject *src, Py_UCS4 dflt if (len < 0) { return -1; } - if (len > 1) { + if (len != 1) { PyErr_Format(PyExc_TypeError, "\"%s\" must be a 1-character string", name); return -1; } /* PyUnicode_READY() is called in PyUnicode_GetLength() */ - else if (len > 0) { - *target = PyUnicode_READ_CHAR(src, 0); - } + *target = PyUnicode_READ_CHAR(src, 0); } } return 0; @@ -272,7 +270,6 @@ _set_char(const char *name, Py_UCS4 *target, PyObject *src, Py_UCS4 dflt) *target = dflt; } else { - *target = NOT_SET; if (!PyUnicode_Check(src)) { PyErr_Format(PyExc_TypeError, "\"%s\" must be string, not %.200s", name, @@ -283,16 +280,14 @@ _set_char(const char *name, Py_UCS4 *target, PyObject *src, Py_UCS4 dflt) if (len < 0) { return -1; } - if (len > 1) { + if (len != 1) { PyErr_Format(PyExc_TypeError, "\"%s\" must be a 1-character string", name); return -1; } /* PyUnicode_READY() is called in PyUnicode_GetLength() */ - else if (len > 0) { - *target = PyUnicode_READ_CHAR(src, 0); - } + *target = PyUnicode_READ_CHAR(src, 0); } return 0; } |