https://github.com/python/cpython/commit/568d220993fa9b4b812ff1b425edd80dbe17dda9
commit: 568d220993fa9b4b812ff1b425edd80dbe17dda9
branch: main
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-01-10T14:52:29+02:00
summary:
gh-70835: Clarify error message for CSV file opened with wrong newline
(GH-113786)
Based on patch by SilentGhost.
files:
M Lib/test/test_csv.py
M Modules/_csv.c
diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
index 97b9bba24bcbca..282cff4344b77f 100644
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -297,13 +297,18 @@ def test_read_oddinputs(self):
[b'abc'], None)
def test_read_eol(self):
- self._read_test(['a,b'], [['a','b']])
- self._read_test(['a,b\n'], [['a','b']])
- self._read_test(['a,b\r\n'], [['a','b']])
- self._read_test(['a,b\r'], [['a','b']])
- self.assertRaises(csv.Error, self._read_test, ['a,b\rc,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._read_test(['a,b', 'c,d'], [['a','b'], ['c','d']])
+ self._read_test(['a,b\n', 'c,d\n'], [['a','b'], ['c','d']])
+ self._read_test(['a,b\r\n', 'c,d\r\n'], [['a','b'], ['c','d']])
+ self._read_test(['a,b\r', 'c,d\r'], [['a','b'], ['c','d']])
+
+ errmsg = "with newline=''"
+ with self.assertRaisesRegex(csv.Error, errmsg):
+ next(csv.reader(['a,b\rc,d']))
+ with self.assertRaisesRegex(csv.Error, errmsg):
+ next(csv.reader(['a,b\nc,d']))
+ with self.assertRaisesRegex(csv.Error, errmsg):
+ next(csv.reader(['a,b\r\nc,d']))
def test_read_eof(self):
self._read_test(['a,"'], [['a', '']])
diff --git a/Modules/_csv.c b/Modules/_csv.c
index ae6b6457ffad9a..d45a15aa8c255a 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -837,7 +837,8 @@ parse_process_char(ReaderObj *self, _csvstate
*module_state, Py_UCS4 c)
self->state = START_RECORD;
else {
PyErr_Format(module_state->error_obj,
- "new-line character seen in unquoted field - do you
need to open the file in universal-newline mode?");
+ "new-line character seen in unquoted field - "
+ "do you need to open the file with newline=''?");
return -1;
}
break;
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
