Fix test_chinese_codecs and test_korean_codecs.

Author: serhiy-storchaka

Lib/test/test_email/test_asian_codecs.py

@@ -83,15 +83,15 @@ def test_chinese_codecs(self):
         h.append(s, Charset('big5hkscs'))
         eq(h.encode(), """\
 Chinese =?gb2312?b?1tDOxA==?= =?gbk?b?1tDOxA==?= =?gb18030?b?1tDOxA==?=
- =?hz?b?fntWUE5Efn0=?= =?big5?b?pKSk5Q==?= =?big5hkscs?b?pKSk5Q==?=""")
+ =?hz-gb-2312?b?fntWUE5Efn0=?= =?big5?b?pKSk5Q==?= =?big5-hkscs?b?pKSk5Q==?=""")
         eq(decode_header(h.encode()),
            [(b'Chinese ', None),
             (b'\xd6\xd0\xce\xc4', 'gb2312'),
             (b'\xd6\xd0\xce\xc4', 'gbk'),
             (b'\xd6\xd0\xce\xc4', 'gb18030'),
-            (b'~{VPND~}', 'hz'),
+            (b'~{VPND~}', 'hz-gb-2312'),
             (b'\xa4\xa4\xa4\xe5', 'big5'),
-            (b'\xa4\xa4\xa4\xe5', 'big5hkscs'),
+            (b'\xa4\xa4\xa4\xe5', 'big5-hkscs'),
            ])
 
     def test_korean_codecs(self):
@@ -104,12 +104,12 @@ def test_korean_codecs(self):
         h.append(s, Charset('iso-2022-kr'))
         h.append(s, Charset('johab'))
         eq(h.encode(), """\
-Korean =?euc-kr?b?x9Gxub7u?= =?ks_c_5601-1987?b?x9Gxub7uIMfRsbm+7g==?=
+Korean =?euc-kr?b?x9Gxub7uIMfRsbm+7g==?= =?ks_c_5601-1987?b?x9Gxub7u?=
  =?iso-2022-kr?b?GyQpQw5HUTE5Pm4P?= =?johab?b?0GWKgrTh?=""")
         eq(decode_header(h.encode()),
            [(b'Korean ', None),
-            (b'\xc7\xd1\xb1\xb9\xbe\xee', 'euc-kr'),
-            (b'\xc7\xd1\xb1\xb9\xbe\xee \xc7\xd1\xb1\xb9\xbe\xee', 'ks_c_5601-1987'),
+            (b'\xc7\xd1\xb1\xb9\xbe\xee \xc7\xd1\xb1\xb9\xbe\xee', 'euc-kr'),
+            (b'\xc7\xd1\xb1\xb9\xbe\xee', 'ks_c_5601-1987'),
             (b'\x1b$)C\x0eGQ19>n\x0f', 'iso-2022-kr'),
             (b'\xd0e\x8a\x82\xb4\xe1', 'johab'),
            ])