mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Martijn Pieters convinced me that when readline() strips the trailing

Browse source 
newline from a multifile part, it should also strip a trailing \r\n.
This commit is contained in:
Guido van Rossum 2001-10-05 21:22:21 +00:00
parent 9475a2310d
commit 39c785108f
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/multifile.py
View file

@ -76,8 +76,11 @@ class MultiFile:
line = self.readahead line = self.readahead
if line: if line:
self.readahead = self._readline() self.readahead = self._readline()
if not self.readahead and line[-1:] == "\n": if not self.readahead:
line = line[:-1] if line[-2:] == "\r\n":
line = line[:-2]
elif line[-1:] == "\n":
line = line[:-1]
return line return line
def _readline(self): def _readline(self):