From c2e2473bc210ff83c2cbc73c4b916893f773b480 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Wed, 7 Sep 2016 13:39:36 -0400 Subject: 27988: Make sure iter_attachments does not mutate the payload list. --- Lib/email/message.py | 2 +- Lib/test/test_email/test_message.py | 10 ++++++++++ Misc/NEWS | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Lib/email/message.py b/Lib/email/message.py index aefaf57..6cd6cb7 100644 --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -1022,7 +1022,7 @@ class MIMEPart(Message): maintype, subtype = self.get_content_type().split('/') if maintype != 'multipart' or subtype == 'alternative': return - parts = self.get_payload() + parts = self.get_payload().copy() if maintype == 'multipart' and subtype == 'related': # For related, we treat everything but the root as an attachment. # The root may be indicated by 'start'; if there's no start or we diff --git a/Lib/test/test_email/test_message.py b/Lib/test/test_email/test_message.py index d78049e..4345162 100644 --- a/Lib/test/test_email/test_message.py +++ b/Lib/test/test_email/test_message.py @@ -732,6 +732,16 @@ class TestEmailMessageBase: m.set_param('filename', 'abc.png', 'Content-Disposition') self.assertTrue(m.is_attachment()) + def test_iter_attachments_mutation(self): + # We had a bug where iter_attachments was mutating the list. + m = self._make_message() + m.set_content('arbitrary text as main part') + m.add_related('more text as a related part') + m.add_related('yet more text as a second "attachment"') + orig = m.get_payload().copy() + self.assertEqual(len(list(m.iter_attachments())), 2) + self.assertEqual(m.get_payload(), orig) + class TestEmailMessage(TestEmailMessageBase, TestEmailBase): message = EmailMessage diff --git a/Misc/NEWS b/Misc/NEWS index 7b4f657..bfc693a 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -62,6 +62,8 @@ Core and Builtins Library ------- +- Issue 27988: Fix email iter_attachments incorrect mutation of payload list. + - Issue #27691: Fix ssl module's parsing of GEN_RID subject alternative name fields in X.509 certs. -- cgit v0.12