mirror of
https://github.com/pacnpal/django-anymail.git
synced 2025-12-20 11:51:05 -05:00
Support from_name in "from_name <email>" sender address.
Allows specifying the sender's display name as part of the from email address,
without requiring use of the DjrillMessage class:
send_mail('Subject', 'Message', 'From Name <from@example.com>',
['Recipient #1 <to1@example.com>', 'to2@example.com'])
(This matches the behavior of Django's default SMTP backend.)
Cherry-picked from:
medmunds/Djrill@46cd5c9d: Support "realname <email>" sender address
medmunds/Djrill@cd4e57cc: Support "realname <email>" sender address - fix for using DjrillMessage
medmunds/Djrill@16f8efc9: Add tests for "Display Name <email@example.com>" addresses
This commit is contained in:
@@ -4,6 +4,7 @@ from django.core.mail.backends.base import BaseEmailBackend
|
||||
from django.core.mail.message import sanitize_address
|
||||
from django.utils import simplejson as json
|
||||
|
||||
from email.utils import parseaddr
|
||||
import requests
|
||||
|
||||
class DjrillBackendHTTPError(Exception):
|
||||
@@ -62,7 +63,6 @@ class DjrillBackend(BaseEmailBackend):
|
||||
self.sender = sanitize_address(message.from_email, message.encoding)
|
||||
recipients_list = [sanitize_address(addr, message.encoding)
|
||||
for addr in message.recipients()]
|
||||
from email.utils import parseaddr
|
||||
self.recipients = [{"email": e, "name": n} for n,e in [
|
||||
parseaddr(r) for r in recipients_list]]
|
||||
|
||||
@@ -101,12 +101,15 @@ class DjrillBackend(BaseEmailBackend):
|
||||
use by default. Standard text email messages sent through Django will
|
||||
still work through Mandrill.
|
||||
"""
|
||||
from_name, from_email = parseaddr(self.sender)
|
||||
msg_dict = {
|
||||
"text": message.body,
|
||||
"subject": message.subject,
|
||||
"from_email": self.sender,
|
||||
"from_email": from_email,
|
||||
"to": self.recipients
|
||||
}
|
||||
if from_name:
|
||||
msg_dict["from_name"] = from_name
|
||||
|
||||
if message.extra_headers:
|
||||
accepted_headers = {}
|
||||
@@ -123,11 +126,12 @@ class DjrillBackend(BaseEmailBackend):
|
||||
Builds advanced message dict
|
||||
"""
|
||||
self.msg_dict.update({
|
||||
"from_name": message.from_name,
|
||||
"tags": message.tags,
|
||||
"track_opens": message.track_opens,
|
||||
"track_clicks": message.track_clicks
|
||||
})
|
||||
if message.from_name:
|
||||
self.msg_dict["from_name"] = message.from_name
|
||||
|
||||
|
||||
def _add_alternatives(self, message):
|
||||
|
||||
Reference in New Issue
Block a user