From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 22 Sep 2002 09:03:03 +0000 (+0000)
Subject: Back out multifile.py 1.19 and 1.20. Fixes #514676.
X-Git-Tag: v2.2.2b1~168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d9df413d37c8f1a7ac67406d6f1b821f30863b3;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/multifile.py b/Lib/multifile.py
index ff7dbf6b14b3..74c35f0388f0 100644
--- a/Lib/multifile.py
+++ b/Lib/multifile.py
@@ -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()