Address review comments.

Author: serhiy-storchaka

Lib/email/charset.py

@@ -59,7 +59,6 @@
     'shift_jis':   (BASE64,    None,    'iso-2022-jp'),
     'iso-2022-jp': (BASE64,    None,    None),
     'koi8-r':      (BASE64,    BASE64,  None),
-    'utf-8':       (SHORTEST,  BASE64, 'utf-8'),
     }
 
 # Map Python codec names to their corresponding MIME/IANA names.
@@ -273,7 +272,7 @@ def __init__(self, input_charset=DEFAULT_CHARSET):
         # Set the attributes, allowing the arguments to override the default.
         self.header_encoding = henc
         self.body_encoding = benc
-        self.output_charset = conv
+        self.output_charset = ALIASES.get(conv, conv)
         # Now set the codecs.  If one isn't defined for input_charset,
         # guess and try a Unicode codec with the same name as input_codec.
         self.input_codec = CODEC_MAP.get(self.input_charset,

Lib/test/test_email/test_contentmanager.py

@@ -342,6 +342,19 @@ def test_set_text_charset_latin_1(self):
         self.assertEqual(m.get_payload(decode=True).decode('utf-8'), content)
         self.assertEqual(m.get_content(), content)
 
+    def test_set_text_charset_cp949(self):
+        m = self._make_message()
+        content = "\ud55c\uad6d\uc5b4\n\uac02\n"
+        raw_data_manager.set_content(m, content, charset='cp949')
+        self.assertEqual(str(m), textwrap.dedent("""\
+            Content-Type: text/plain; charset="euc-kr"
+            Content-Transfer-Encoding: base64
+
+            x9Gxub7uCqTUpKGkv6SiCg==
+            """))
+        self.assertEqual(m.get_payload(decode=True).decode('euc-kr'), content)
+        self.assertEqual(m.get_content(), content)
+
     def test_set_text_plain_long_line_heuristics(self):
         m = self._make_message()
         content = ("Simple but long message that is over 78 characters"

Lib/test/test_email/test_email.py

@@ -5079,15 +5079,16 @@ def test_user_charsets(self):
         self.assertEqual(c.output_codec, 'fake0')
 
         charset.add_alias('fake1', 'mime-fake')
+        charset.add_alias('output-mime-fake', 'output-mime-fake-alias')
         charset.add_codec('mime-fake', 'fakecodec')
-        charset.add_codec('output-mime-fake', 'outputfakecodec')
+        charset.add_codec('output-mime-fake-alias', 'outputfakecodec')
         charset.add_charset('mime-fake', charset.QP, None, 'output-mime-fake')
 
         c = Charset('fake1')
         self.assertEqual(c.input_charset, 'mime-fake')
         self.assertEqual(c.header_encoding, charset.QP)
         self.assertEqual(c.body_encoding, None)
-        self.assertEqual(c.output_charset, 'output-mime-fake')
+        self.assertEqual(c.output_charset, 'output-mime-fake-alias')
         self.assertEqual(c.input_codec, 'fakecodec')
         self.assertEqual(c.output_codec, 'outputfakecodec')