Browse files

[py3] Workarounded a Python bug in mail header encoding

  • Loading branch information...
1 parent 6086f73 commit 6e4c9840988b1aa3ae4598a7d04b13ada078be33 @claudep claudep committed Aug 17, 2012
Showing with 6 additions and 1 deletion.
  1. +6 −1 django/core/mail/message.py
View
7 django/core/mail/message.py
@@ -99,7 +99,12 @@ def sanitize_address(addr, encoding):
if isinstance(addr, six.string_types):
addr = parseaddr(force_text(addr))
nm, addr = addr
- nm = Header(nm, encoding).encode()
+ # This try-except clause is needed on Python 3 < 3.2.4
+ # http://bugs.python.org/issue14291
+ try:
+ nm = Header(nm, encoding).encode()
+ except UnicodeEncodeError:
+ nm = Header(nm, 'utf-8').encode()
try:
addr.encode('ascii')
except UnicodeEncodeError: # IDN

0 comments on commit 6e4c984

Please sign in to comment.