mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #11311: StringIO.readline(0) now returns an empty string as all other

Browse source 
file-like objects.
This commit is contained in:
Serhiy Storchaka 2013-02-13 12:26:58 +02:00
parent 34fe1b7a3d
commit 8d7d6bcc25
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/StringIO.py
View file

@ -158,7 +158,7 @@ class StringIO:
newpos = self.len
else:
newpos = i+1
if length is not None and length > 0:
if length is not None and length >= 0:
if self.pos + length < newpos:
newpos = self.pos + length
r = self.buf[self.pos:newpos]

2
Lib/test/test_StringIO.py
View file

@ -28,6 +28,8 @@ class TestGenericStringIO(unittest.TestCase):
eq = self.assertEqual
self.assertRaises(TypeError, self._fp.seek)
eq(self._fp.read(10), self._line[:10])
eq(self._fp.read(0), '')
eq(self._fp.readline(0), '')
eq(self._fp.readline(), self._line[10:] + '\n')
eq(len(self._fp.readlines(60)), 2)
self._fp.seek(0)

3
Misc/NEWS
View file

@ -205,6 +205,9 @@ Core and Builtins
Library
-------
- Issue #11311: StringIO.readline(0) now returns an empty string as all other
file-like objects.
- Issue #16800: tempfile.gettempdir() no longer left temporary files when
the disk is full. Original patch by Amir Szekely.