mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge: #21091: make is_attachment a method.

Browse source
This commit is contained in:
R David Murray 2014-09-20 18:16:39 -04:00
commit 7c4093ca95
4 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/email/message.py
View file

@ -9,6 +9,7 @@ __all__ = ['Message']
import re
import uu
import quopri
import warnings
from io import BytesIO, StringIO
# Intrapackage imports
@ -938,13 +939,12 @@ class MIMEPart(Message):
policy = default
Message.__init__(self, policy)
@property
def is_attachment(self):
c_d = self.get('content-disposition')
return False if c_d is None else c_d.content_disposition == 'attachment'
def _find_body(self, part, preferencelist):
if part.is_attachment:
if part.is_attachment():
return
maintype, subtype = part.get_content_type().split('/')
if maintype == 'text':
@ -1037,7 +1037,7 @@ class MIMEPart(Message):
for part in parts:
maintype, subtype = part.get_content_type().split('/')
if ((maintype, subtype) in self._body_types and
not part.is_attachment and subtype not in seen):
not part.is_attachment() and subtype not in seen):
seen.append(subtype)
continue
yield part