https://github.com/python/cpython/commit/59a7b9495b64f0be8992564d30217137f0f0a662
commit: 59a7b9495b64f0be8992564d30217137f0f0a662
branch: 3.12
author: Miss Islington (bot) <31488909+miss-isling...@users.noreply.github.com>
committer: serhiy-storchaka <storch...@gmail.com>
date: 2024-01-10T13:26:04Z
summary:
[3.12] gh-70835: Clarify error message for CSV file opened with wrong newline
(GH-113786) (GH-113905)
Based on patch by SilentGhost.
(cherry picked from commit 568d220993fa9b4b812ff1b425edd80dbe17dda9)
Co-authored-by: Serhiy Storchaka <storch...@gmail.com>
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 bc9961e0831f0e..30383698d04184 100644
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -309,13 +309,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 9ab2ad266c2739..91cb63628a1f7b 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -841,7 +841,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 -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
