mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Correct test_cvs on Windows, as suggested by Raghuram Devarakonda

Browse source 
in issue1395. All other places in this file already use newline=''...

Also check that csv.reader is given an iterable returning strings.
This commit is contained in:
Amaury Forgeot d'Arc 2007-11-19 21:20:21 +00:00
parent a2d1d7e3b2
commit 10c476db2c
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/_csv.c
View file

@ -270,7 +270,7 @@ _set_str(const char *name, PyObject **target, PyObject *src, const char *dflt)
*target = NULL;
else if (!IS_BASESTRING(src)) {
PyErr_Format(PyExc_TypeError,
"\"%s\" must be an string", name);
"\"%s\" must be a string", name);
return -1;
}
else {
@ -793,6 +793,16 @@ Reader_iternext(ReaderObj *self)
"newline inside string");
return NULL;
}
if (!PyUnicode_Check(lineobj))
{
PyErr_Format(error_obj,
"Iterator should return strings, "
"not %.200s "
"(did you open the file in text mode?)",
lineobj->ob_type->tp_name
);
return NULL;
}
++self->line_num;
line = PyUnicode_AsUnicode(lineobj);
linelen = PyUnicode_GetSize(lineobj);