mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 03:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-44395: Fix MIMEPart.as_string to pass unixfrom properly (GH-26685)

Browse source 
(cherry picked from commit 30f7a77f35)

Co-authored-by: Dong-hee Na <donghee.na@python.org>
This commit is contained in:
Miss Islington (bot) 2021-06-21 07:27:26 -07:00 • committed by GitHub
parent 6614eac843
commit 20a1495b8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/email/message.py
View file

@ -948,7 +948,7 @@ class MIMEPart(Message):
if policy is None:
from email.policy import default
policy = default
Message.__init__(self, policy)
super().__init__(policy)
def as_string(self, unixfrom=False, maxheaderlen=None, policy=None):
@ -965,7 +965,7 @@ class MIMEPart(Message):
policy = self.policy if policy is None else policy
if maxheaderlen is None:
maxheaderlen = policy.max_line_length
return super().as_string(maxheaderlen=maxheaderlen, policy=policy)
return super().as_string(unixfrom, maxheaderlen, policy)
def __str__(self):
return self.as_string(policy=self.policy.clone(utf8=True))

7
Lib/test/test_email/test_message.py
View file

@ -775,6 +775,13 @@ class TestEmailMessage(TestEmailMessageBase, TestEmailBase):
self.assertEqual(len(m.as_string(maxheaderlen=34).strip().splitlines()),
6)
def test_as_string_unixform(self):
m = self._str_msg('test')
m.set_unixfrom('From foo@bar Thu Jan 1 00:00:00 1970')
self.assertEqual(m.as_string(unixfrom=True),
'From foo@bar Thu Jan 1 00:00:00 1970\n\ntest')
self.assertEqual(m.as_string(unixfrom=False), '\ntest')
def test_str_defaults_to_policy_max_line_length(self):
m = self._str_msg('Subject: long line' + ' ab'*50 + '\n\n')
self.assertEqual(len(str(m).strip().splitlines()), 3)

2
Misc/NEWS.d/next/Library/2021-06-12-10-08-14.bpo-44395.PcW6Sx.rst Normal file
View file

@ -0,0 +1,2 @@
Fix :meth:`~email.message.MIMEPart.as_string` to pass unixfrom properly.
Patch by Dong-hee Na.