traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make StringIO like other file objects in that readline(-1) has no effect #7348

This commit is contained in:
Benjamin Peterson 2009-12-13 17:29:16 +00:00
parent 4895af4ef1
commit 414721614f
2 changed files with 3 additions and 1 deletions
Show Stats 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 newpos = self.len
else: else:
newpos = i+1 newpos = i+1
if length is not None: if length is not None and length > 0:
if self.pos + length < newpos: if self.pos + length < newpos:
newpos = self.pos + length newpos = self.pos + length
r = self.buf[self.pos:newpos] r = self.buf[self.pos:newpos]

2
Lib/test/test_StringIO.py
View File

@ -28,6 +28,8 @@ class TestGenericStringIO(unittest.TestCase):
eq(self._fp.read(10), self._line[:10]) eq(self._fp.read(10), self._line[:10])
eq(self._fp.readline(), self._line[10:] + '\n') eq(self._fp.readline(), self._line[10:] + '\n')
eq(len(self._fp.readlines(60)), 2) eq(len(self._fp.readlines(60)), 2)
self._fp.seek(0)
eq(self._fp.readline(-1), self._line + '\n')
def test_writes(self): def test_writes(self):
f = self.MODULE.StringIO() f = self.MODULE.StringIO()