Skip to content
Snippets Groups Projects
Commit 70709d6a authored by Tobias Dussa's avatar Tobias Dussa
Browse files

Now handles UTF-8 messages more resiliently.

parent 0de3a27a
No related branches found
No related tags found
No related merge requests found
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
from email.generator import Generator from email.generator import Generator
from email.message import EmailMessage from email.message import EmailMessage
from email.mime.text import MIMEText
from email.utils import formatdate, make_msgid from email.utils import formatdate, make_msgid
import argparse import argparse
import csv import csv
...@@ -347,8 +348,8 @@ def createMail(data): ...@@ -347,8 +348,8 @@ def createMail(data):
directory = os.path.dirname(output) directory = os.path.dirname(output)
# Generate email body and attachments # Generate email body and attachments
message = EmailMessage() message = MIMEText(template.render(data))
message.set_content(template.render(data)) message.set_charset('utf-8')
for attach in args.attach: for attach in args.attach:
with open(attach, 'rb') as attachment: with open(attach, 'rb') as attachment:
message.add_attachment(attachment.read(), *magic.from_file(attach, mime=True).split('/')) message.add_attachment(attachment.read(), *magic.from_file(attach, mime=True).split('/'))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment