diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2015-11-01 14:45:26 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-11-01 14:45:26 (GMT) |
commit | 56275dc1e2a2f354620189efd751fa90af2118e1 (patch) | |
tree | 4912005e11192ecc7edac3899e72bc2c8f0460ea /Lib/test | |
parent | 14eefe353e3f251bce0bc7ed3415f78c17174d94 (diff) | |
parent | 314464d0ab4ad283fce7594158b2464d47cc68d8 (diff) | |
download | cpython-56275dc1e2a2f354620189efd751fa90af2118e1.zip cpython-56275dc1e2a2f354620189efd751fa90af2118e1.tar.gz cpython-56275dc1e2a2f354620189efd751fa90af2118e1.tar.bz2 |
Issue #25510: fileinput.FileInput.readline() now returns b'' instead of ''
at the end if the FileInput was opened with binary mode.
Patch by Ryosuke Ito.
Diffstat (limited to 'Lib/test')
-rw-r--r-- | Lib/test/test_fileinput.py | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py index 1d089f5..4765a05 100644 --- a/Lib/test/test_fileinput.py +++ b/Lib/test/test_fileinput.py @@ -288,6 +288,21 @@ class FileInputTests(unittest.TestCase): with self.assertRaises(UnicodeDecodeError): # Read to the end of file. list(fi) + self.assertEqual(fi.readline(), '') + self.assertEqual(fi.readline(), '') + + def test_readline_binary_mode(self): + with open(TESTFN, 'wb') as f: + f.write(b'A\nB\r\nC\rD') + self.addCleanup(safe_unlink, TESTFN) + + with FileInput(files=TESTFN, mode='rb') as fi: + self.assertEqual(fi.readline(), b'A\n') + self.assertEqual(fi.readline(), b'B\r\n') + self.assertEqual(fi.readline(), b'C\rD') + # Read to the end of file. + self.assertEqual(fi.readline(), b'') + self.assertEqual(fi.readline(), b'') def test_context_manager(self): try: |