Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #46 'always send CRLF line endings over SMTP in Python 3' #47

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix #46 'always send CRLF line endings over SMTP in Python 3' #47

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3659d0f
Ensure CRLF line endings when sending email
dholth Mar 4, 2020
a906baa
use as_bytes / fallback for Python 2
dholth Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion repoze/sendmail/encoding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
from email import utils
from email import header

try:
from email.policy import SMTP
except ImportError:
SMTP = None

from repoze.sendmail._compat import PY_2
from repoze.sendmail._compat import text_type

Expand Down Expand Up @@ -100,7 +105,10 @@ def encode_message(message,
The return is a byte string of the whole message.
"""
cleanup_message(message)
return message.as_string().encode('ascii')
if SMTP: # Python 3.3+
return message.as_bytes(policy=SMTP)
else:
return message.as_string().encode('ascii')


def best_charset(text):
Expand Down