Normalize charset in set_text_content().

Author: serhiy-storchaka

Lib/email/charset.py

@@ -121,8 +121,6 @@
     'kz1048': 'kz-1048',
     'mac-roman': 'macintosh',
 
-    # latin-1 and iso-8859-1 are different codecs in Python.
-    'latin-1': 'iso-8859-1',
     # CP949 is not registered in IANA. KS_C_5601-1987 is not the same,
     # but the closest registered option.
     'cp949': 'ks_c_5601-1987',

Lib/email/contentmanager.py

@@ -173,11 +173,11 @@ def set_text_content(msg, string, subtype="plain", charset='utf-8', cte=None,
                      disposition=None, filename=None, cid=None,
                      params=None, headers=None):
     _prepare_set(msg, 'text', subtype, headers)
+
+    charset = email.charset.Charset(charset).input_charset
     cte, payload = _encode_text(string, charset, cte, msg.policy)
     msg.set_payload(payload)
-    msg.set_param('charset',
-                  email.charset.ALIASES.get(charset, charset),
-                  replace=True)
+    msg.set_param('charset', charset, replace=True)
     msg['Content-Transfer-Encoding'] = cte
     _finalize_set(msg, disposition, filename, cid, params)
 raw_data_manager.add_set_handler(str, set_text_content)