[Python-checkins] python/dist/src/Lib multifile.py,1.20,1.20.10.1

2002年9月22日 02:03:05 -0700

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv21696
Modified Files:
 Tag: release22-maint
	multifile.py 
Log Message:
Back out multifile.py 1.19 and 1.20. Fixes #514676.
Index: multifile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/multifile.py,v
retrieving revision 1.20
retrieving revision 1.20.10.1
diff -C2 -d -r1.20 -r1.20.10.1
*** multifile.py	5 Oct 2001 21:22:21 -0000	1.20
--- multifile.py	22 Sep 2002 09:03:03 -0000	1.20.10.1
***************
*** 42,46 ****
 self.level = 0
 self.last = 0
- self.readahead = ""
 if seekable:
 self.seekable = 1
--- 42,45 ----
***************
*** 51,55 ****
 if self.level > 0:
 return self.lastpos
! return self.fp.tell() - len(self.readahead) - self.start
 
 def seek(self, pos, whence=0):
--- 50,54 ----
 if self.level > 0:
 return self.lastpos
! return self.fp.tell() - self.start
 
 def seek(self, pos, whence=0):
***************
*** 69,88 ****
 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 ''
--- 68,73 ----