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.
This commit is contained in:
Serhiy Storchaka 2015-11-01 16:43:58 +02:00
parent 1f1177d69a
commit 314464d0ab
3 changed files with 23 additions and 1 deletions

View File

@ -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

View File

@ -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:

View File

@ -96,6 +96,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 #21827: Fixed textwrap.dedent() for the case when largest common
whitespace is a substring of smallest leading whitespace.
Based on patch by Robert Li.