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

Merge: #19003: Only replace \r and/or \n line endings in email.generator.

Browse source
This commit is contained in:
R David Murray 2016-09-11 17:23:33 -04:00
parent 727cc9337f
commit 29097d5a6a
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/email/generator.py
View file

@ -18,6 +18,7 @@ from email.utils import _has_surrogates
UNDERSCORE = '_'
NL = '\n' # XXX: no longer used by the code below.
NLCRE = re.compile(r'\r\n|\r|\n')
fcre = re.compile(r'^From ', re.MULTILINE)
@ -149,14 +150,17 @@ class Generator:
# We have to transform the line endings.
if not lines:
return
lines = lines.splitlines(True)
lines = NLCRE.split(lines)
for line in lines[:-1]:
self.write(line.rstrip('\r\n'))
self.write(self._NL)
laststripped = lines[-1].rstrip('\r\n')
self.write(laststripped)
if len(lines[-1]) != len(laststripped):
self.write(line)
self.write(self._NL)
if lines[-1]:
self.write(lines[-1])
# XXX logic tells me this else should be needed, but the tests fail
# with it and pass without it. (NLCRE.split ends with a blank element
# if and only if there was a trailing newline.)
#else:
# self.write(self._NL)
def _write(self, msg):
# We can't write the headers yet because of the following scenario: