Merge pull request #133 from lavr/ascii_from_to

Encode address only when not ascii

Author: lavr

emails/message.py

@@ -40,10 +40,12 @@ def __init__(self,
                  text=None,
                  attachments=None,
                  cc=None,
-                 bcc=None):
+                 bcc=None,
+                 headers_encoding=None):
 
         self._attachments = None
-        self.charset = charset or 'utf-8'  # utf-8 is standard de-facto, yeah
+        self.charset = charset or 'utf-8'
+        self.headers_encoding = headers_encoding or 'ascii'
         self._message_id = message_id
         self.set_subject(subject)
         self.set_date(date)
@@ -227,7 +229,7 @@ def set_header(self, msg, key, value, encode=True):
             raise BadHeaderError("Header values can't contain newlines (got %r for header %r)" % (value, key))
 
         if key.lower() in self.ADDRESS_HEADERS:
-            value = ', '.join(sanitize_address(addr, self.charset)
+            value = ', '.join(sanitize_address(addr, self.headers_encoding)
                               for addr in getaddresses((value,)))
 
         msg[key] = encode and self.encode_header(value) or value

emails/testsuite/message/test_message.py

@@ -113,6 +113,23 @@ def test_headers_not_double_encoded():
     assert decode_header(msg['Subject']) == TEXT
 
 
+def test_headers_ascii_encoded():
+    """
+    Test we encode To/From header only when it not-ascii
+    """
+
+    for text, encoded in (
+        ('웃', '=?utf-8?b?7JuD?='),
+        ('ascii text', 'ascii text'),
+    ):
+        msg = Message(mail_from=(text, 'a@b.c'),
+                      mail_to=(text, 'a@b.c'),
+                      subject=text,
+                      html='...').as_message()
+        assert parseaddr(msg['From'])[0] == encoded
+        assert parseaddr(msg['To'])[0] == encoded
+
+
 def test_message_addresses():
 
     m = Message()