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

Add counting of source iterator lines to the reader object - handy for

Browse source 
user error messages (otherwise difficult to do without instrumenting
the source).
This commit is contained in:
Andrew McNamara 2005-01-12 11:17:16 +00:00
parent 0f0599ddc1
commit 7f2053eff3
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/_csv.c
View file

@ -98,6 +98,7 @@ typedef struct {
int field_len; /* length of current field */
int had_parse_error; /* did we have a parse error? */
int numeric_field; /* treat field as numeric */
unsigned long line_num; /* Source-file line number */
} ReaderObj;
staticforward PyTypeObject Reader_Type;
@ -734,6 +735,7 @@ parse_process_char(ReaderObj *self, char c)
static struct PyMemberDef Reader_memberlist[] = {
{ "dialect", T_OBJECT, R_OFF(dialect), RO },
{ "line_num", T_ULONG, R_OFF(line_num), RO },
{ NULL }
};
@ -753,6 +755,7 @@ Reader_iternext(ReaderObj *self)
"newline inside string");
return NULL;
}
++self->line_num;
if (self->had_parse_error)
if (parse_reset(self) < 0) {
@ -924,6 +927,7 @@ csv_reader(PyObject *module, PyObject *args, PyObject *keyword_args)
self->input_iter = NULL;
self->field = NULL;
self->field_size = 0;
self->line_num = 0;
if (parse_reset(self) < 0) {
Py_DECREF(self);