diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2024-01-10 14:52:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-10 14:52:29 +0200 |
commit | 568d220993fa9b4b812ff1b425edd80dbe17dda9 (patch) | |
tree | 6f5233883f42236759663ef861527d66fc6a2657 /Lib/test/test_csv.py | |
parent | aef4a1203c06efde8505aefc9cf994e9a23f398d (diff) | |
download | cpython-568d220993fa9b4b812ff1b425edd80dbe17dda9.tar.gz cpython-568d220993fa9b4b812ff1b425edd80dbe17dda9.zip |
gh-70835: Clarify error message for CSV file opened with wrong newline (GH-113786)
Based on patch by SilentGhost.
Diffstat (limited to 'Lib/test/test_csv.py')
-rw-r--r-- | Lib/test/test_csv.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index 97b9bba24bc..282cff4344b 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -297,13 +297,18 @@ class Test_Csv(unittest.TestCase): [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', '']]) |