[Python-checkins] cpython (3.2): #15232: correctly mangle From lines in MIME preamble and epilogue
r.david.murray
python-checkins at python.org
Mon Jul 23 03:55:35 CEST 2012
http://hg.python.org/cpython/rev/b97f65f2298d
changeset: 78245:b97f65f2298d
branch: 3.2
parent: 78243:84b577567fab
user: R David Murray <rdmurray at bitdance.com>
date: Sun Jul 22 21:47:53 2012 -0400
summary:
#15232: correctly mangle From lines in MIME preamble and epilogue
files:
Lib/email/generator.py | 12 ++++++++++--
Lib/email/test/test_email.py | 22 ++++++++++++++++++++++
Misc/NEWS | 3 +++
3 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/Lib/email/generator.py b/Lib/email/generator.py
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -233,7 +233,11 @@
msg.set_boundary(boundary)
# If there's a preamble, write it out, with a trailing CRLF
if msg.preamble is not None:
- self.write(msg.preamble + self._NL)
+ if self._mangle_from_:
+ preamble = fcre.sub('>From ', msg.preamble)
+ else:
+ preamble = msg.preamble
+ self.write(preamble + self._NL)
# dash-boundary transport-padding CRLF
self.write('--' + boundary + self._NL)
# body-part
@@ -251,7 +255,11 @@
self.write(self._NL + '--' + boundary + '--')
if msg.epilogue is not None:
self.write(self._NL)
- self.write(msg.epilogue)
+ if self._mangle_from_:
+ epilogue = fcre.sub('>From ', msg.epilogue)
+ else:
+ epilogue = msg.epilogue
+ self.write(epilogue)
def _handle_multipart_signed(self, msg):
# The contents of signed parts has to stay unmodified in order to keep
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -1275,6 +1275,28 @@
Blah blah blah
""")
+ def test_mangle_from_in_preamble_and_epilog(self):
+ s = StringIO()
+ g = Generator(s, mangle_from_=True)
+ msg = email.message_from_string(textwrap.dedent("""\
+ From: foo at bar.com
+ Mime-Version: 1.0
+ Content-Type: multipart/mixed; boundary=XXX
+
+ From somewhere unknown
+
+ --XXX
+ Content-Type: text/plain
+
+ foo
+
+ --XXX--
+
+ From somewhere unknowable
+ """))
+ g.flatten(msg)
+ self.assertEqual(len([1 for x in s.getvalue().split('\n')
+ if x.startswith('>From ')]), 2)
# Test the basic MIMEAudio class
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -98,6 +98,9 @@
Library
-------
+- Issue #15232: when mangle_from is True, email.Generator now correctly mangles
+ lines that start with 'From' that occur in a MIME preamble or epilogue.
+
- Issue #13922: argparse no longer incorrectly strips '--'s that appear
after the first one.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list