diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2013-12-19 14:28:04 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-12-19 14:28:04 (GMT) |
| commit | cf58fb5e2947ebe6ac1e06b7f8fbe9a417b7430f (patch) | |
| tree | dd05fec470e5b75a4a79c6e5fb89e45048c66617 /Modules/_csv.c | |
| parent | 5272fa9c5707b3cdcd6f49fdaf595b21bec6b2bd (diff) | |
| parent | cac23a50ee2979b8c2e3472e6b13efb1a8bd4f78 (diff) | |
| download | cpython-cf58fb5e2947ebe6ac1e06b7f8fbe9a417b7430f.zip cpython-cf58fb5e2947ebe6ac1e06b7f8fbe9a417b7430f.tar.gz cpython-cf58fb5e2947ebe6ac1e06b7f8fbe9a417b7430f.tar.bz2 | |
Issue #18829: csv.Dialect() now checks type for delimiter, escapechar and
quotechar fields. Original patch by Vajrasky Kok.
Diffstat (limited to 'Modules/_csv.c')
| -rw-r--r-- | Modules/_csv.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Modules/_csv.c b/Modules/_csv.c index 183a9a5..c8767d1 100644 --- a/Modules/_csv.c +++ b/Modules/_csv.c @@ -239,6 +239,12 @@ _set_char(const char *name, Py_UCS4 *target, PyObject *src, Py_UCS4 dflt) *target = '\0'; if (src != Py_None) { Py_ssize_t len; + if (!PyUnicode_Check(src)) { + PyErr_Format(PyExc_TypeError, + "\"%s\" must be string, not %.200s", name, + src->ob_type->tp_name); + return -1; + } len = PyUnicode_GetLength(src); if (len > 1) { PyErr_Format(PyExc_TypeError, @@ -425,7 +431,8 @@ dialect_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) if (dialect_check_quoting(self->quoting)) goto err; if (self->delimiter == 0) { - PyErr_SetString(PyExc_TypeError, "delimiter must be set"); + PyErr_SetString(PyExc_TypeError, + "\"delimiter\" must be an 1-character string"); goto err; } if (quotechar == Py_None && quoting == NULL) |