From 97dfad7856df5d9c681fa74d576a23247cc55a33 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Sat, 20 Sep 2014 17:44:53 -0400 Subject: [PATCH] #21079: is_attachment now looks only at the value, ignoring parameters. --- Lib/email/message.py | 4 +--- Lib/test/test_email/test_message.py | 3 ++- Misc/NEWS | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Lib/email/message.py b/Lib/email/message.py index aa46debeba..124071d5e1 100644 --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -941,9 +941,7 @@ class MIMEPart(Message): @property def is_attachment(self): c_d = self.get('content-disposition') - if c_d is None: - return False - return c_d.lower() == 'attachment' + return False if c_d is None else c_d.content_disposition == 'attachment' def _find_body(self, part, preferencelist): if part.is_attachment: diff --git a/Lib/test/test_email/test_message.py b/Lib/test/test_email/test_message.py index c761c62d04..51ddf36099 100644 --- a/Lib/test/test_email/test_message.py +++ b/Lib/test/test_email/test_message.py @@ -729,7 +729,8 @@ class TestEmailMessageBase: self.assertTrue(m.is_attachment) m.replace_header('Content-Disposition', 'AtTachMent') self.assertTrue(m.is_attachment) - + m.set_param('filename', 'abc.png', 'Content-Disposition') + self.assertTrue(m.is_attachment) class TestEmailMessage(TestEmailMessageBase, TestEmailBase): diff --git a/Misc/NEWS b/Misc/NEWS index 1ba6a4ac65..c5afa50c83 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -32,6 +32,9 @@ Core and Builtins Library ------- +- Issue #21079: Fix email.message.EmailMessage.is_attachment to return the + correct result when the header has parameters as well as a value. + - Issue #22247: Add NNTPError to nntplib.__all__. - Issue #4180: The warnings registries are now reset when the filters -- 2.40.0