summaryrefslogtreecommitdiffstats
path: root/Lib/email
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2014-09-20 22:16:39 (GMT)
committerR David Murray <rdmurray@bitdance.com>2014-09-20 22:16:39 (GMT)
commit7c4093ca95b9aebd11dad069bcdb20f9b0ce902d (patch)
treed3923c715776e92db6610865b6dda9ec554118ef /Lib/email
parent1de0ac05f3467faad2e0a0d6d08f86c06bf43b1b (diff)
parent8a97896a765e4b1ef8753b4a410a8f3e981cb9b8 (diff)
downloadcpython-7c4093ca95b9aebd11dad069bcdb20f9b0ce902d.zip
cpython-7c4093ca95b9aebd11dad069bcdb20f9b0ce902d.tar.gz
cpython-7c4093ca95b9aebd11dad069bcdb20f9b0ce902d.tar.bz2
Merge: #21091: make is_attachment a method.
Diffstat (limited to 'Lib/email')
-rw-r--r--Lib/email/message.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/email/message.py b/Lib/email/message.py
index 124071d..727cd1e 100644
--- a/Lib/email/message.py
+++ b/Lib/email/message.py
@@ -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