diff options
Diffstat (limited to 'Lib/email')
| -rw-r--r-- | Lib/email/headerregistry.py | 6 | ||||
| -rw-r--r-- | Lib/email/message.py | 16 |
2 files changed, 5 insertions, 17 deletions
diff --git a/Lib/email/headerregistry.py b/Lib/email/headerregistry.py index 1fae950..2bdae6c 100644 --- a/Lib/email/headerregistry.py +++ b/Lib/email/headerregistry.py @@ -80,7 +80,8 @@ class Address: return lp def __repr__(self): - return "Address(display_name={!r}, username={!r}, domain={!r})".format( + return "{}(display_name={!r}, username={!r}, domain={!r})".format( + self.__class__.__name__, self.display_name, self.username, self.domain) def __str__(self): @@ -131,7 +132,8 @@ class Group: return self._addresses def __repr__(self): - return "Group(display_name={!r}, addresses={!r}".format( + return "{}(display_name={!r}, addresses={!r}".format( + self.__class__.__name__, self.display_name, self.addresses) def __str__(self): diff --git a/Lib/email/message.py b/Lib/email/message.py index a179f8e..727cd1e 100644 --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -930,17 +930,6 @@ class Message: # I.e. def walk(self): ... from email.iterators import walk -# XXX Support for temporary deprecation hack for is_attachment property. -class _IsAttachment: - def __init__(self, value): - self.value = value - def __call__(self): - return self.value - def __bool__(self): - warnings.warn("is_attachment will be a method, not a property, in 3.5", - DeprecationWarning, - stacklevel=3) - return self.value class MIMEPart(Message): @@ -950,12 +939,9 @@ class MIMEPart(Message): policy = default Message.__init__(self, policy) - @property def is_attachment(self): c_d = self.get('content-disposition') - result = False if c_d is None else c_d.content_disposition == 'attachment' - # XXX transitional hack to raise deprecation if not called. - return _IsAttachment(result) + return False if c_d is None else c_d.content_disposition == 'attachment' def _find_body(self, part, preferencelist): if part.is_attachment(): |