Another merge from mimelib:
_handle_multipart(): If there is an epilogue and the epilogue does
not itself start with a newline, add a newline before writing the
epilogue. Closes SF bug #472481.
diff --git a/Lib/email/Generator.py b/Lib/email/Generator.py
index 12b9fdf..e969d00 100644
--- a/Lib/email/Generator.py
+++ b/Lib/email/Generator.py
@@ -273,6 +273,8 @@
print >> self._fp, '\n--' + boundary + '--',
# Write out any epilogue
if msg.epilogue is not None:
+ if not msg.epilogue.startswith('\n'):
+ print >> self._fp
self._fp.write(msg.epilogue)
def _handle_multipart_digest(self, msg):