bn8/python-mylib
1
0
Fork 0
Code Issues Pull requests Projects Releases 12 Wiki Activity Actions

EmailClient: fix handling templates and permit to use Mako Template

Browse source
This commit is contained in:
Benjamin Renard 2021-03-24 19:11:32 +01:00
parent 0229cc9ab4
commit fac20864ce
1 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
EmailClient.py
View file

@ -9,6 +9,8 @@ from email.mime.multipart import MIMEMultipart
from email.mime.base import MIMEBase from email.mime.base import MIMEBase
from email.encoders import encode_base64 from email.encoders import encode_base64
from mako.template import Template as MakoTemplate
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -83,21 +85,27 @@ class EmailClient(object):
msg['Date'] = email.utils.formatdate(None, True) msg['Date'] = email.utils.formatdate(None, True)
encoding = encoding if encoding else self.encoding encoding = encoding if encoding else self.encoding
if template: if template:
assert template in templates, "Unknwon template %s" % template assert template in self.templates, "Unknwon template %s" % template
# Handle subject from template # Handle subject from template
if not subject: if not subject:
assert templates[template].get('subject'), 'No subject defined in template %s' % template assert self.templates[template].get('subject'), 'No subject defined in template %s' % template
msg['Subject'] = templates[template]['subject'].format(**template_vars) msg['Subject'] = self.templates[template]['subject'].format(**template_vars)
# Put HTML part in last one to prefered it # Put HTML part in last one to prefered it
parts = [] parts = []
if templates[template].get('text'): if self.templates[template].get('text'):
parts.append((templates[template].get('text'), 'plain')) if isinstance(self.templates[template]['text'], MakoTemplate):
if templates[template].get('html'): parts.append((self.templates[template]['text'].render(**template_vars), 'plain'))
parts.append((templates[template].get('html'), 'html')) else:
parts.append((self.templates[template]['text'].format(**template_vars), 'plain'))
if self.templates[template].get('html'):
if isinstance(self.templates[template]['html'], MakoTemplate):
parts.append((self.templates[template]['html'].render(**template_vars), 'html'))
else:
parts.append((self.templates[template]['html'].format(**template_vars), 'html'))
for body, mime_type in parts: for body, mime_type in parts:
msg.attach(MIMEText(body.format(**template_vars).encode(encoding), mime_type, _charset=encoding)) msg.attach(MIMEText(body.encode(encoding), mime_type, _charset=encoding))
else: else:
assert subject, 'No subject provided' assert subject, 'No subject provided'
if text_body: if text_body:
@ -313,6 +321,13 @@ if __name__ == '__main__':
help="Test email recipient", help="Test email recipient",
) )
test_opts.add_argument(
'-m', '--mako',
action="store_true",
dest="test_mako",
help="Test mako templating",
)
options = parser.parse_args() options = parser.parse_args()
if not options.test_to: if not options.test_to:
@ -340,8 +355,14 @@ if __name__ == '__main__':
templates = dict( templates = dict(
test=dict( test=dict(
subject="Test email", subject="Test email",
text="Just a test email sent at {sent_date}.", text=(
html="<strong>Just a test email.</stong>" "Just a test email sent at {sent_date}." if not options.test_mako else
MakoTemplate("Just a test email sent at ${sent_date}.")
),
html=(
"<strong>Just a test email.</stong> <small>(sent at {sent_date})</small>" if not options.test_mako else
MakoTemplate("<strong>Just a test email.</stong> <small>(sent at ${sent_date})</small>")
)
) )
) )