traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 3.2: Issue #16013: Fix CSV Reader parsing issue with ending quote characters. Patch by Serhiy Storchaka.

This commit is contained in:
Senthil Kumaran 2012-09-25 02:37:20 -07:00
parent 9118a79c7c 67b7b98a47
commit 49d130227b
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/test/test_csv.py
View File

@ -225,6 +225,15 @@ class Test_Csv(unittest.TestCase):
self.assertRaises(csv.Error, self._read_test, ['a,b\nc,d'], []) self.assertRaises(csv.Error, self._read_test, ['a,b\nc,d'], [])
self.assertRaises(csv.Error, self._read_test, ['a,b\r\nc,d'], []) self.assertRaises(csv.Error, self._read_test, ['a,b\r\nc,d'], [])
def test_read_eof(self):
self._read_test(['a,"'], [['a', '']])
self._read_test(['"a'], [['a']])
self._read_test(['^'], [['\n']], escapechar='^')
self.assertRaises(csv.Error, self._read_test, ['a,"'], [], strict=True)
self.assertRaises(csv.Error, self._read_test, ['"a'], [], strict=True)
self.assertRaises(csv.Error, self._read_test,
['^'], [], escapechar='^', strict=True)
def test_read_escape(self): def test_read_escape(self):
self._read_test(['a,\\b,c'], [['a', 'b', 'c']], escapechar='\\') self._read_test(['a,\\b,c'], [['a', 'b', 'c']], escapechar='\\')
self._read_test(['a,b\\,c'], [['a', 'b,c']], escapechar='\\') self._read_test(['a,b\\,c'], [['a', 'b,c']], escapechar='\\')

3
Misc/NEWS
View File

@ -31,6 +31,9 @@ Core and Builtins
Library Library
------- -------
- Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
Patch by Serhiy Storchaka.
- Issue #15421: Fix an OverflowError in Calendar.itermonthdates() after - Issue #15421: Fix an OverflowError in Calendar.itermonthdates() after
datetime.MAXYEAR. Patch by Cédric Krier. datetime.MAXYEAR. Patch by Cédric Krier.

11
Modules/_csv.c
View File

@ -788,9 +788,14 @@ Reader_iternext(ReaderObj *self)
lineobj = PyIter_Next(self->input_iter); lineobj = PyIter_Next(self->input_iter);
if (lineobj == NULL) { if (lineobj == NULL) {
/* End of input OR exception */ /* End of input OR exception */
if (!PyErr_Occurred() && self->field_len != 0) if (!PyErr_Occurred() && (self->field_len != 0 ||
PyErr_Format(_csvstate_global->error_obj, self->state == IN_QUOTED_FIELD)) {
"newline inside string"); if (self->dialect->strict)
PyErr_SetString(_csvstate_global->error_obj,
"unexpected end of data");
else if (parse_save_field(self) >= 0)
break;
}
return NULL; return NULL;
} }
if (!PyUnicode_Check(lineobj)) { if (!PyUnicode_Check(lineobj)) {