summaryrefslogtreecommitdiffstats
path: root/Lib/email/generator.py
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2012-03-14 18:05:03 (GMT)
committerR David Murray <rdmurray@bitdance.com>2012-03-14 18:05:03 (GMT)
commit9fd170e2d053bd86592b8728bdd00cf2d2a06d0b (patch)
tree3bbd815324702f30da3971990a5a6c7641ab52e3 /Lib/email/generator.py
parent525fd5447d0fdd6209a57090af65cbb811ad5999 (diff)
downloadcpython-9fd170e2d053bd86592b8728bdd00cf2d2a06d0b.zip
cpython-9fd170e2d053bd86592b8728bdd00cf2d2a06d0b.tar.gz
cpython-9fd170e2d053bd86592b8728bdd00cf2d2a06d0b.tar.bz2
#14062: fix BytesParser handling of linesep for Header objects
This also affected smtplib.SMTP.send_message, which calls BytesParser.
Diffstat (limited to 'Lib/email/generator.py')
-rw-r--r--Lib/email/generator.py2
1 files changed, 1 insertions, 1 deletions
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 @@ class BytesGenerator(Generator):
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