commit 9fd170e2d053bd86592b8728bdd00cf2d2a06d0b
author R David Murray <rdmurray@bitdance.com> Wed Mar 14 14:05:03 2012 -0400
committer R David Murray <rdmurray@bitdance.com> Wed Mar 14 14:05:03 2012 -0400
tree 3bbd815324702f30da3971990a5a6c7641ab52e3
parent 525fd5447d0fdd6209a57090af65cbb811ad5999

#14062: fix BytesParser handling of linesep for Header objects

This also affected smtplib.SMTP.send_message, which calls BytesParser.

Lib/email/generator.py

diff --git a/Lib/email/generator.py b/Lib/email/generator.py
index f0e7a95..430ee73 100644
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -360,7 +360,7 @@
         for h, v in msg._headers:
             self.write('%s: ' % h)
             if isinstance(v, Header):
-                self.write(v.encode(maxlinelen=self._maxheaderlen)+NL)
+                self.write(v.encode(maxlinelen=self._maxheaderlen)+self._NL)
             elif _has_surrogates(v):
                 # If we have raw 8bit data in a byte string, we have no idea
                 # what the encoding is.  There is no safe way to split this