mirror of
https://github.com/pacnpal/django-anymail.git
synced 2025-12-20 03:41:05 -05:00
Reformat code with automated tools
Apply standardized code style
This commit is contained in:
@@ -19,27 +19,31 @@ class AnymailMessageMixin(EmailMessage):
|
||||
"""
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
self.esp_extra = kwargs.pop('esp_extra', UNSET)
|
||||
self.envelope_sender = kwargs.pop('envelope_sender', UNSET)
|
||||
self.metadata = kwargs.pop('metadata', UNSET)
|
||||
self.send_at = kwargs.pop('send_at', UNSET)
|
||||
self.tags = kwargs.pop('tags', UNSET)
|
||||
self.track_clicks = kwargs.pop('track_clicks', UNSET)
|
||||
self.track_opens = kwargs.pop('track_opens', UNSET)
|
||||
self.template_id = kwargs.pop('template_id', UNSET)
|
||||
self.merge_data = kwargs.pop('merge_data', UNSET)
|
||||
self.merge_global_data = kwargs.pop('merge_global_data', UNSET)
|
||||
self.merge_metadata = kwargs.pop('merge_metadata', UNSET)
|
||||
self.esp_extra = kwargs.pop("esp_extra", UNSET)
|
||||
self.envelope_sender = kwargs.pop("envelope_sender", UNSET)
|
||||
self.metadata = kwargs.pop("metadata", UNSET)
|
||||
self.send_at = kwargs.pop("send_at", UNSET)
|
||||
self.tags = kwargs.pop("tags", UNSET)
|
||||
self.track_clicks = kwargs.pop("track_clicks", UNSET)
|
||||
self.track_opens = kwargs.pop("track_opens", UNSET)
|
||||
self.template_id = kwargs.pop("template_id", UNSET)
|
||||
self.merge_data = kwargs.pop("merge_data", UNSET)
|
||||
self.merge_global_data = kwargs.pop("merge_global_data", UNSET)
|
||||
self.merge_metadata = kwargs.pop("merge_metadata", UNSET)
|
||||
self.anymail_status = AnymailStatus()
|
||||
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
def attach_inline_image_file(self, path, subtype=None, idstring="img", domain=None):
|
||||
"""Add inline image from file path to an EmailMessage, and return its content id"""
|
||||
"""
|
||||
Add inline image from file path to an EmailMessage, and return its content id
|
||||
"""
|
||||
assert isinstance(self, EmailMessage)
|
||||
return attach_inline_image_file(self, path, subtype, idstring, domain)
|
||||
|
||||
def attach_inline_image(self, content, filename=None, subtype=None, idstring="img", domain=None):
|
||||
def attach_inline_image(
|
||||
self, content, filename=None, subtype=None, idstring="img", domain=None
|
||||
):
|
||||
"""Add inline image and return its content id"""
|
||||
assert isinstance(self, EmailMessage)
|
||||
return attach_inline_image(self, content, filename, subtype, idstring, domain)
|
||||
@@ -57,27 +61,32 @@ def attach_inline_image_file(message, path, subtype=None, idstring="img", domain
|
||||
return attach_inline_image(message, content, filename, subtype, idstring, domain)
|
||||
|
||||
|
||||
def attach_inline_image(message, content, filename=None, subtype=None, idstring="img", domain=None):
|
||||
def attach_inline_image(
|
||||
message, content, filename=None, subtype=None, idstring="img", domain=None
|
||||
):
|
||||
"""Add inline image to an EmailMessage, and return its content id"""
|
||||
if domain is None:
|
||||
# Avoid defaulting to hostname that might end in '.com', because some ESPs
|
||||
# use Content-ID as filename, and Gmail blocks filenames ending in '.com'.
|
||||
domain = 'inline' # valid domain for a msgid; will never be a real TLD
|
||||
content_id = make_msgid(idstring, domain) # Content ID per RFC 2045 section 7 (with <...>)
|
||||
domain = "inline" # valid domain for a msgid; will never be a real TLD
|
||||
|
||||
# Content ID per RFC 2045 section 7 (with <...>):
|
||||
content_id = make_msgid(idstring, domain)
|
||||
|
||||
image = MIMEImage(content, subtype)
|
||||
image.add_header('Content-Disposition', 'inline', filename=filename)
|
||||
image.add_header('Content-ID', content_id)
|
||||
image.add_header("Content-Disposition", "inline", filename=filename)
|
||||
image.add_header("Content-ID", content_id)
|
||||
message.attach(image)
|
||||
return unquote(content_id) # Without <...>, for use as the <img> tag src
|
||||
|
||||
|
||||
ANYMAIL_STATUSES = [
|
||||
'sent', # the ESP has sent the message (though it may or may not get delivered)
|
||||
'queued', # the ESP will try to send the message later
|
||||
'invalid', # the recipient email was not valid
|
||||
'rejected', # the recipient is blacklisted
|
||||
'failed', # the attempt to send failed for some other reason
|
||||
'unknown', # anything else
|
||||
"sent", # the ESP has sent the message (though it may or may not get delivered)
|
||||
"queued", # the ESP will try to send the message later
|
||||
"invalid", # the recipient email was not valid
|
||||
"rejected", # the recipient is blacklisted
|
||||
"failed", # the attempt to send failed for some other reason
|
||||
"unknown", # anything else
|
||||
]
|
||||
|
||||
|
||||
@@ -98,16 +107,20 @@ class AnymailRecipientStatus:
|
||||
|
||||
def __repr__(self):
|
||||
return "AnymailRecipientStatus({message_id!r}, {status!r})".format(
|
||||
message_id=self.message_id, status=self.status)
|
||||
message_id=self.message_id, status=self.status
|
||||
)
|
||||
|
||||
|
||||
class AnymailStatus:
|
||||
"""Information about an EmailMessage's send status for all recipients"""
|
||||
|
||||
def __init__(self):
|
||||
self.message_id = None # set of ESP message ids across all recipients, or bare id if only one, or None
|
||||
self.status = None # set of ANYMAIL_STATUSES across all recipients, or None for not yet sent to ESP
|
||||
self.recipients = {} # per-recipient: { email: AnymailRecipientStatus, ... }
|
||||
#: set of ESP message ids across all recipients, or bare id if only one, or None
|
||||
self.message_id = None
|
||||
#: set of ANYMAIL_STATUSES across all recipients, or None if not yet sent to ESP
|
||||
self.status = None
|
||||
#: per-recipient: { email: AnymailRecipientStatus, ... }
|
||||
self.recipients = {}
|
||||
self.esp_response = None
|
||||
|
||||
def __repr__(self):
|
||||
@@ -118,17 +131,26 @@ class AnymailStatus:
|
||||
return "{%s}" % ", ".join(item_reprs)
|
||||
else:
|
||||
return repr(o)
|
||||
|
||||
details = ["status={status}".format(status=_repr(self.status))]
|
||||
if self.message_id:
|
||||
details.append("message_id={message_id}".format(message_id=_repr(self.message_id)))
|
||||
details.append(
|
||||
"message_id={message_id}".format(message_id=_repr(self.message_id))
|
||||
)
|
||||
if self.recipients:
|
||||
details.append("{num_recipients} recipients".format(num_recipients=len(self.recipients)))
|
||||
details.append(
|
||||
"{num_recipients} recipients".format(
|
||||
num_recipients=len(self.recipients)
|
||||
)
|
||||
)
|
||||
return "AnymailStatus<{details}>".format(details=", ".join(details))
|
||||
|
||||
def set_recipient_status(self, recipients):
|
||||
self.recipients.update(recipients)
|
||||
recipient_statuses = self.recipients.values()
|
||||
self.message_id = set([recipient.message_id for recipient in recipient_statuses])
|
||||
self.message_id = set(
|
||||
[recipient.message_id for recipient in recipient_statuses]
|
||||
)
|
||||
if len(self.message_id) == 1:
|
||||
self.message_id = self.message_id.pop() # de-set-ify if single message_id
|
||||
self.status = set([recipient.status for recipient in recipient_statuses])
|
||||
|
||||
Reference in New Issue
Block a user