diff options
| -rw-r--r-- | Lib/fileinput.py | 5 | ||||
| -rw-r--r-- | Lib/test/test_fileinput.py | 15 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
3 files changed, 23 insertions, 1 deletions
diff --git a/Lib/fileinput.py b/Lib/fileinput.py index af810d1..c41b94a 100644 --- a/Lib/fileinput.py +++ b/Lib/fileinput.py @@ -315,7 +315,10 @@ class FileInput: return line if not self._file: if not self._files: - return "" + if 'b' in self._mode: + return b'' + else: + return '' self._filename = self._files[0] self._files = self._files[1:] self._filelineno = 0 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: @@ -48,6 +48,10 @@ Core and Builtins Library ------- +- 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. + - Issue #25503: Fixed inspect.getdoc() for inherited docstrings of properties. Original patch by John Mark Vandenberg. |