mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-10 02:50:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Back out multifile.py 1.19 and 1.20. Fixes #514676.

Browse source
This commit is contained in:
Martin v. Löwis 2002-09-22 09:01:08 +00:00
parent 4a38583456
commit a6026c6a0f
2 changed files with 67 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/multifile.py
View file

@ -41,7 +41,6 @@ class MultiFile:
self.stack = [] # Grows down
self.level = 0
self.last = 0
self.readahead = ""
if seekable:
self.seekable = 1
self.start = self.fp.tell()
@ -50,7 +49,7 @@ class MultiFile:
def tell(self):
if self.level > 0:
return self.lastpos
return self.fp.tell() - len(self.readahead) - self.start
return self.fp.tell() - self.start
def seek(self, pos, whence=0):
here = self.tell()
@ -68,22 +67,8 @@ class MultiFile:
self.fp.seek(pos + self.start)
self.level = 0
self.last = 0
self.readahead = ""
def readline(self):
if not self.readahead:
self.readahead = self._readline()
line = self.readahead
if line:
self.readahead = self._readline()
if not self.readahead:
if line[-2:] == "\r\n":
line = line[:-2]
elif line[-1:] == "\n":
line = line[:-1]
return line
def _readline(self):
if self.level > 0:
return ''
line = self.fp.readline()