diff -r 31a2d270c0c3 Doc/library/codecs.rst --- a/Doc/library/codecs.rst Wed Oct 12 20:13:24 2016 +0200 +++ b/Doc/library/codecs.rst Thu Oct 13 17:19:50 2016 +0200 @@ -1200,6 +1200,8 @@ | shift_jisx0213 | shiftjisx0213, sjisx0213, | Japanese | | | s_jisx0213 | | +-----------------+--------------------------------+--------------------------------+ +| tcvn5712_3 | tcvn5712 | Vietnamese | ++-----------------+--------------------------------+--------------------------------+ | utf_32 | U32, utf32 | all languages | +-----------------+--------------------------------+--------------------------------+ | utf_32_be | UTF-32BE | all languages | diff -r 31a2d270c0c3 Doc/whatsnew/3.5.rst --- a/Doc/whatsnew/3.5.rst Wed Oct 12 20:13:24 2016 +0200 +++ b/Doc/whatsnew/3.5.rst Thu Oct 13 17:19:50 2016 +0200 @@ -711,6 +711,9 @@ * New Kazakh ``kz1048`` and Tajik ``koi8_t`` :ref:`codecs `. (Contributed by Serhiy Storchaka in :issue:`22682` and :issue:`22681`.) +* New Vietnamese ``tcvn5712`` :ref:`codecs `. + (Contributed by Serhiy Storchaka in :issue:`21081`.) + * Property docstrings are now writable. This is especially useful for :func:`collections.namedtuple` docstrings. (Contributed by Berker Peksag in :issue:`24064`.) diff -r 31a2d270c0c3 Lib/encodings/aliases.py --- a/Lib/encodings/aliases.py Wed Oct 12 20:13:24 2016 +0200 +++ b/Lib/encodings/aliases.py Thu Oct 13 17:19:50 2016 +0200 @@ -493,6 +493,9 @@ # tactis codec 'tis260' : 'tactis', + # tcvn codec + 'tcvn5712_3' : 'tcvn5712', + # tis_620 codec 'tis620' : 'tis_620', 'tis_620_0' : 'tis_620', diff -r 31a2d270c0c3 Lib/encodings/tcvn5712.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Lib/encodings/tcvn5712.py Thu Oct 13 17:19:50 2016 +0200 @@ -0,0 +1,308 @@ +""" Python Character Mapping Codec tcvn5712 generated from 'tmp/TCVN5712-3.TXT' with gencodec.py. + +"""#" + +import codecs + +### Codec APIs + +class Codec(codecs.Codec): + + def encode(self, input, errors='strict'): + return codecs.charmap_encode(input, errors, encoding_table) + + def decode(self, input, errors='strict'): + return codecs.charmap_decode(input, errors, decoding_table) + +class IncrementalEncoder(codecs.IncrementalEncoder): + def encode(self, input, final=False): + return codecs.charmap_encode(input, self.errors, encoding_table)[0] + +class IncrementalDecoder(codecs.IncrementalDecoder): + def decode(self, input, final=False): + return codecs.charmap_decode(input, self.errors, decoding_table)[0] + +class StreamWriter(Codec, codecs.StreamWriter): + pass + +class StreamReader(Codec, codecs.StreamReader): + pass + +### encodings module API + +def getregentry(): + return codecs.CodecInfo( + name='tcvn5712', + encode=Codec().encode, + decode=Codec().decode, + incrementalencoder=IncrementalEncoder, + incrementaldecoder=IncrementalDecoder, + streamreader=StreamReader, + streamwriter=StreamWriter, + ) + + +### Decoding Table + +decoding_table = ( + '\x00' # 0x00 -> NULL + '\x01' # 0x01 -> START OF HEADING + '\x02' # 0x02 -> START OF TEXT + '\x03' # 0x03 -> END OF TEXT + '\x04' # 0x04 -> END OF TRANSMISSION + '\x05' # 0x05 -> ENQUIRY + '\x06' # 0x06 -> ACKNOWLEDGE + '\x07' # 0x07 -> BELL + '\x08' # 0x08 -> BACKSPACE + '\t' # 0x09 -> HORIZONTAL TABULATION + '\n' # 0x0A -> LINE FEED + '\x0b' # 0x0B -> VERTICAL TABULATION + '\x0c' # 0x0C -> FORM FEED + '\r' # 0x0D -> CARRIAGE RETURN + '\x0e' # 0x0E -> SHIFT OUT + '\x0f' # 0x0F -> SHIFT IN + '\x10' # 0x10 -> DATA LINK ESCAPE + '\x11' # 0x11 -> DEVICE CONTROL ONE + '\x12' # 0x12 -> DEVICE CONTROL TWO + '\x13' # 0x13 -> DEVICE CONTROL THREE + '\x14' # 0x14 -> DEVICE CONTROL FOUR + '\x15' # 0x15 -> NEGATIVE ACKNOWLEDGE + '\x16' # 0x16 -> SYNCHRONOUS IDLE + '\x17' # 0x17 -> END OF TRANSMISSION BLOCK + '\x18' # 0x18 -> CANCEL + '\x19' # 0x19 -> END OF MEDIUM + '\x1a' # 0x1A -> SUBSTITUTE + '\x1b' # 0x1B -> ESCAPE + '\x1c' # 0x1C -> FILE SEPARATOR + '\x1d' # 0x1D -> GROUP SEPARATOR + '\x1e' # 0x1E -> RECORD SEPARATOR + '\x1f' # 0x1F -> UNIT SEPARATOR + ' ' # 0x20 -> SPACE + '!' # 0x21 -> EXCLAMATION MARK + '"' # 0x22 -> QUOTATION MARK + '#' # 0x23 -> NUMBER SIGN + '$' # 0x24 -> DOLLAR SIGN + '%' # 0x25 -> PERCENT SIGN + '&' # 0x26 -> AMPERSAND + "'" # 0x27 -> APOSTROPHE + '(' # 0x28 -> LEFT PARENTHESIS + ')' # 0x29 -> RIGHT PARENTHESIS + '*' # 0x2A -> ASTERISK + '+' # 0x2B -> PLUS SIGN + ',' # 0x2C -> COMMA + '-' # 0x2D -> HYPHEN-MINUS + '.' # 0x2E -> FULL STOP + '/' # 0x2F -> SOLIDUS + '0' # 0x30 -> DIGIT ZERO + '1' # 0x31 -> DIGIT ONE + '2' # 0x32 -> DIGIT TWO + '3' # 0x33 -> DIGIT THREE + '4' # 0x34 -> DIGIT FOUR + '5' # 0x35 -> DIGIT FIVE + '6' # 0x36 -> DIGIT SIX + '7' # 0x37 -> DIGIT SEVEN + '8' # 0x38 -> DIGIT EIGHT + '9' # 0x39 -> DIGIT NINE + ':' # 0x3A -> COLON + ';' # 0x3B -> SEMICOLON + '<' # 0x3C -> LESS-THAN SIGN + '=' # 0x3D -> EQUALS SIGN + '>' # 0x3E -> GREATER-THAN SIGN + '?' # 0x3F -> QUESTION MARK + '@' # 0x40 -> COMMERCIAL AT + 'A' # 0x41 -> LATIN CAPITAL LETTER A + 'B' # 0x42 -> LATIN CAPITAL LETTER B + 'C' # 0x43 -> LATIN CAPITAL LETTER C + 'D' # 0x44 -> LATIN CAPITAL LETTER D + 'E' # 0x45 -> LATIN CAPITAL LETTER E + 'F' # 0x46 -> LATIN CAPITAL LETTER F + 'G' # 0x47 -> LATIN CAPITAL LETTER G + 'H' # 0x48 -> LATIN CAPITAL LETTER H + 'I' # 0x49 -> LATIN CAPITAL LETTER I + 'J' # 0x4A -> LATIN CAPITAL LETTER J + 'K' # 0x4B -> LATIN CAPITAL LETTER K + 'L' # 0x4C -> LATIN CAPITAL LETTER L + 'M' # 0x4D -> LATIN CAPITAL LETTER M + 'N' # 0x4E -> LATIN CAPITAL LETTER N + 'O' # 0x4F -> LATIN CAPITAL LETTER O + 'P' # 0x50 -> LATIN CAPITAL LETTER P + 'Q' # 0x51 -> LATIN CAPITAL LETTER Q + 'R' # 0x52 -> LATIN CAPITAL LETTER R + 'S' # 0x53 -> LATIN CAPITAL LETTER S + 'T' # 0x54 -> LATIN CAPITAL LETTER T + 'U' # 0x55 -> LATIN CAPITAL LETTER U + 'V' # 0x56 -> LATIN CAPITAL LETTER V + 'W' # 0x57 -> LATIN CAPITAL LETTER W + 'X' # 0x58 -> LATIN CAPITAL LETTER X + 'Y' # 0x59 -> LATIN CAPITAL LETTER Y + 'Z' # 0x5A -> LATIN CAPITAL LETTER Z + '[' # 0x5B -> LEFT SQUARE BRACKET + '\\' # 0x5C -> REVERSE SOLIDUS + ']' # 0x5D -> RIGHT SQUARE BRACKET + '^' # 0x5E -> CIRCUMFLEX ACCENT + '_' # 0x5F -> LOW LINE + '`' # 0x60 -> GRAVE ACCENT + 'a' # 0x61 -> LATIN SMALL LETTER A + 'b' # 0x62 -> LATIN SMALL LETTER B + 'c' # 0x63 -> LATIN SMALL LETTER C + 'd' # 0x64 -> LATIN SMALL LETTER D + 'e' # 0x65 -> LATIN SMALL LETTER E + 'f' # 0x66 -> LATIN SMALL LETTER F + 'g' # 0x67 -> LATIN SMALL LETTER G + 'h' # 0x68 -> LATIN SMALL LETTER H + 'i' # 0x69 -> LATIN SMALL LETTER I + 'j' # 0x6A -> LATIN SMALL LETTER J + 'k' # 0x6B -> LATIN SMALL LETTER K + 'l' # 0x6C -> LATIN SMALL LETTER L + 'm' # 0x6D -> LATIN SMALL LETTER M + 'n' # 0x6E -> LATIN SMALL LETTER N + 'o' # 0x6F -> LATIN SMALL LETTER O + 'p' # 0x70 -> LATIN SMALL LETTER P + 'q' # 0x71 -> LATIN SMALL LETTER Q + 'r' # 0x72 -> LATIN SMALL LETTER R + 's' # 0x73 -> LATIN SMALL LETTER S + 't' # 0x74 -> LATIN SMALL LETTER T + 'u' # 0x75 -> LATIN SMALL LETTER U + 'v' # 0x76 -> LATIN SMALL LETTER V + 'w' # 0x77 -> LATIN SMALL LETTER W + 'x' # 0x78 -> LATIN SMALL LETTER X + 'y' # 0x79 -> LATIN SMALL LETTER Y + 'z' # 0x7A -> LATIN SMALL LETTER Z + '{' # 0x7B -> LEFT CURLY BRACKET + '|' # 0x7C -> VERTICAL LINE + '}' # 0x7D -> RIGHT CURLY BRACKET + '~' # 0x7E -> TILDE + '\x7f' # 0x7F -> DELETE + '\ufffe' # 0x80 -> UNDEFINED + '\ufffe' # 0x81 -> UNDEFINED + '\ufffe' # 0x82 -> UNDEFINED + '\ufffe' # 0x83 -> UNDEFINED + '\ufffe' # 0x84 -> UNDEFINED + '\ufffe' # 0x85 -> UNDEFINED + '\ufffe' # 0x86 -> UNDEFINED + '\ufffe' # 0x87 -> UNDEFINED + '\ufffe' # 0x88 -> UNDEFINED + '\ufffe' # 0x89 -> UNDEFINED + '\ufffe' # 0x8A -> UNDEFINED + '\ufffe' # 0x8B -> UNDEFINED + '\ufffe' # 0x8C -> UNDEFINED + '\ufffe' # 0x8D -> UNDEFINED + '\ufffe' # 0x8E -> UNDEFINED + '\ufffe' # 0x8F -> UNDEFINED + '\ufffe' # 0x90 -> UNDEFINED + '\ufffe' # 0x91 -> UNDEFINED + '\ufffe' # 0x92 -> UNDEFINED + '\ufffe' # 0x93 -> UNDEFINED + '\ufffe' # 0x94 -> UNDEFINED + '\ufffe' # 0x95 -> UNDEFINED + '\ufffe' # 0x96 -> UNDEFINED + '\ufffe' # 0x97 -> UNDEFINED + '\ufffe' # 0x98 -> UNDEFINED + '\ufffe' # 0x99 -> UNDEFINED + '\ufffe' # 0x9A -> UNDEFINED + '\ufffe' # 0x9B -> UNDEFINED + '\ufffe' # 0x9C -> UNDEFINED + '\ufffe' # 0x9D -> UNDEFINED + '\ufffe' # 0x9E -> UNDEFINED + '\ufffe' # 0x9F -> UNDEFINED + '\xa0' # 0xA0 -> NO-BREAK SPACE + '\u0102' # 0xA1 -> LATIN CAPITAL LETTER A WITH BREVE + '\xc2' # 0xA2 -> LATIN CAPITAL LETTER A WITH CIRCUMFLEX + '\xca' # 0xA3 -> LATIN CAPITAL LETTER E WITH CIRCUMFLEX + '\xd4' # 0xA4 -> LATIN CAPITAL LETTER O WITH CIRCUMFLEX + '\u01a0' # 0xA5 -> LATIN CAPITAL LETTER O WITH HORN + '\u01af' # 0xA6 -> LATIN CAPITAL LETTER U WITH HORN + '\u0110' # 0xA7 -> LATIN CAPITAL LETTER D WITH STROKE + '\u0103' # 0xA8 -> LATIN SMALL LETTER A WITH BREVE + '\xe2' # 0xA9 -> LATIN SMALL LETTER A WITH CIRCUMFLEX + '\xea' # 0xAA -> LATIN SMALL LETTER E WITH CIRCUMFLEX + '\xf4' # 0xAB -> LATIN SMALL LETTER O WITH CIRCUMFLEX + '\u01a1' # 0xAC -> LATIN SMALL LETTER O WITH HORN + '\u01b0' # 0xAD -> LATIN SMALL LETTER U WITH HORN + '\u0111' # 0xAE -> LATIN SMALL LETTER D WITH STROKE + '\ufffe' # 0xAF -> UNDEFINED + '\ufffe' # 0xB0 -> UNDEFINED + '\ufffe' # 0xB1 -> UNDEFINED + '\ufffe' # 0xB2 -> UNDEFINED + '\ufffe' # 0xB3 -> UNDEFINED + '\ufffe' # 0xB4 -> UNDEFINED + '\xe0' # 0xB5 -> LATIN SMALL LETTER A WITH GRAVE + '\u1ea3' # 0xB6 -> LATIN SMALL LETTER A WITH HOOK ABOVE + '\xe3' # 0xB7 -> LATIN SMALL LETTER A WITH TILDE + '\xe1' # 0xB8 -> LATIN SMALL LETTER A WITH ACUTE + '\u1ea1' # 0xB9 -> LATIN SMALL LETTER A WITH DOT BELOW + '\ufffe' # 0xBA -> UNDEFINED + '\u1eb1' # 0xBB -> LATIN SMALL LETTER A WITH BREVE AND GRAVE + '\u1eb3' # 0xBC -> LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE + '\u1eb5' # 0xBD -> LATIN SMALL LETTER A WITH BREVE AND TILDE + '\u1eaf' # 0xBE -> LATIN SMALL LETTER A WITH BREVE AND ACUTE + '\ufffe' # 0xBF -> UNDEFINED + '\ufffe' # 0xC0 -> UNDEFINED + '\ufffe' # 0xC1 -> UNDEFINED + '\ufffe' # 0xC2 -> UNDEFINED + '\ufffe' # 0xC3 -> UNDEFINED + '\ufffe' # 0xC4 -> UNDEFINED + '\ufffe' # 0xC5 -> UNDEFINED + '\u1eb7' # 0xC6 -> LATIN SMALL LETTER A WITH BREVE AND DOT BELOW + '\u1ea7' # 0xC7 -> LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE + '\u1ea9' # 0xC8 -> LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE + '\u1eab' # 0xC9 -> LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE + '\u1ea5' # 0xCA -> LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE + '\u1ead' # 0xCB -> LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW + '\xe8' # 0xCC -> LATIN SMALL LETTER E WITH GRAVE + '\ufffe' # 0xCD -> UNDEFINED + '\u1ebb' # 0xCE -> LATIN SMALL LETTER E WITH HOOK ABOVE + '\u1ebd' # 0xCF -> LATIN SMALL LETTER E WITH TILDE + '\xe9' # 0xD0 -> LATIN SMALL LETTER E WITH ACUTE + '\u1eb9' # 0xD1 -> LATIN SMALL LETTER E WITH DOT BELOW + '\u1ec1' # 0xD2 -> LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE + '\u1ec3' # 0xD3 -> LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE + '\u1ec5' # 0xD4 -> LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE + '\u1ebf' # 0xD5 -> LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE + '\u1ec7' # 0xD6 -> LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW + '\xec' # 0xD7 -> LATIN SMALL LETTER I WITH GRAVE + '\u1ec9' # 0xD8 -> LATIN SMALL LETTER I WITH HOOK ABOVE + '\ufffe' # 0xD9 -> UNDEFINED + '\ufffe' # 0xDA -> UNDEFINED + '\ufffe' # 0xDB -> UNDEFINED + '\u0129' # 0xDC -> LATIN SMALL LETTER I WITH TILDE + '\xed' # 0xDD -> LATIN SMALL LETTER I WITH ACUTE + '\u1ecb' # 0xDE -> LATIN SMALL LETTER I WITH DOT BELOW + '\xf2' # 0xDF -> LATIN SMALL LETTER O WITH GRAVE + '\ufffe' # 0xE0 -> UNDEFINED + '\u1ecf' # 0xE1 -> LATIN SMALL LETTER O WITH HOOK ABOVE + '\xf5' # 0xE2 -> LATIN SMALL LETTER O WITH TILDE + '\xf3' # 0xE3 -> LATIN SMALL LETTER O WITH ACUTE + '\u1ecd' # 0xE4 -> LATIN SMALL LETTER O WITH DOT BELOW + '\u1ed3' # 0xE5 -> LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE + '\u1ed5' # 0xE6 -> LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE + '\u1ed7' # 0xE7 -> LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE + '\u1ed1' # 0xE8 -> LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE + '\u1ed9' # 0xE9 -> LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW + '\u1edd' # 0xEA -> LATIN SMALL LETTER O WITH HORN AND GRAVE + '\u1edf' # 0xEB -> LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE + '\u1ee1' # 0xEC -> LATIN SMALL LETTER O WITH HORN AND TILDE + '\u1edb' # 0xED -> LATIN SMALL LETTER O WITH HORN AND ACUTE + '\u1ee3' # 0xEE -> LATIN SMALL LETTER O WITH HORN AND DOT BELOW + '\xf9' # 0xEF -> LATIN SMALL LETTER U WITH GRAVE + '\ufffe' # 0xF0 -> UNDEFINED + '\u1ee7' # 0xF1 -> LATIN SMALL LETTER U WITH HOOK ABOVE + '\u0169' # 0xF2 -> LATIN SMALL LETTER U WITH TILDE + '\xfa' # 0xF3 -> LATIN SMALL LETTER U WITH ACUTE + '\u1ee5' # 0xF4 -> LATIN SMALL LETTER U WITH DOT BELOW + '\u1eeb' # 0xF5 -> LATIN SMALL LETTER U WITH HORN AND GRAVE + '\u1eed' # 0xF6 -> LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE + '\u1eef' # 0xF7 -> LATIN SMALL LETTER U WITH HORN AND TILDE + '\u1ee9' # 0xF8 -> LATIN SMALL LETTER U WITH HORN AND ACUTE + '\u1ef1' # 0xF9 -> LATIN SMALL LETTER U WITH HORN AND DOT BELOW + '\u1ef3' # 0xFA -> LATIN SMALL LETTER Y WITH GRAVE + '\u1ef7' # 0xFB -> LATIN SMALL LETTER Y WITH HOOK ABOVE + '\u1ef9' # 0xFC -> LATIN SMALL LETTER Y WITH TILDE + '\xfd' # 0xFD -> LATIN SMALL LETTER Y WITH ACUTE + '\u1ef5' # 0xFE -> LATIN SMALL LETTER Y WITH DOT BELOW + '\ufffe' # 0xFF -> UNDEFINED +) + +### Encoding table +encoding_table = codecs.charmap_build(decoding_table) + diff -r 31a2d270c0c3 Lib/locale.py --- a/Lib/locale.py Wed Oct 12 20:13:24 2016 +0200 +++ b/Lib/locale.py Thu Oct 13 17:19:50 2016 +0200 @@ -693,6 +693,7 @@ 'iso8859_9': 'ISO8859-9', 'iso2022_jp': 'JIS7', 'shift_jis': 'SJIS', + 'tcvn_5712': 'tcvn-5712', 'tactis': 'TACTIS', 'euc_jp': 'eucJP', 'euc_kr': 'eucKR', diff -r 31a2d270c0c3 Lib/test/test_codecs.py --- a/Lib/test/test_codecs.py Wed Oct 12 20:13:24 2016 +0200 +++ b/Lib/test/test_codecs.py Thu Oct 13 17:19:50 2016 +0200 @@ -1898,6 +1898,7 @@ "shift_jis_2004", "shift_jisx0213", "tis_620", + "tcvn5712", "unicode_escape", "unicode_internal", "utf_16", diff -r 31a2d270c0c3 Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py Wed Oct 12 20:13:24 2016 +0200 +++ b/Lib/test/test_unicode.py Thu Oct 13 17:19:50 2016 +0200 @@ -2105,7 +2105,7 @@ 'cp856', 'cp857', 'cp864', 'cp869', 'cp874', 'mac_greek', 'mac_iceland','mac_roman', 'mac_turkish', - 'cp1006', 'iso8859_8', + 'cp1006', 'iso8859_8', 'tcvn5712', ### These have undefined mappings: #'cp424', @@ -2126,11 +2126,10 @@ 'iso8859_10', 'iso8859_13', 'iso8859_14', 'iso8859_15', 'iso8859_2', 'iso8859_4', 'iso8859_5', 'iso8859_9', 'koi8_r', 'koi8_u', 'latin_1', - 'mac_cyrillic', 'mac_latin2', - + 'mac_cyrillic', 'mac_latin2', ### These have undefined mappings: #'cp1250', 'cp1251', 'cp1252', 'cp1253', 'cp1254', 'cp1255', - #'cp1256', 'cp1257', 'cp1258', + #'cp1256', 'cp1257', 'cp1258','tcvn5712', #'cp424', 'cp856', 'cp857', 'cp864', 'cp869', 'cp874', #'iso8859_3', 'iso8859_6', 'iso8859_7', 'koi8_t', 'kz1048', #'mac_greek', 'mac_iceland','mac_roman', 'mac_turkish', diff -r 31a2d270c0c3 Lib/test/test_xml_etree.py --- a/Lib/test/test_xml_etree.py Wed Oct 12 20:13:24 2016 +0200 +++ b/Lib/test/test_xml_etree.py Thu Oct 13 17:19:50 2016 +0200 @@ -759,7 +759,7 @@ 'mac-cyrillic', 'mac-greek', 'mac-iceland', 'mac-latin2', 'mac-roman', 'mac-turkish', 'iso2022-jp', 'iso2022-jp-1', 'iso2022-jp-2', 'iso2022-jp-2004', - 'iso2022-jp-3', 'iso2022-jp-ext', + 'iso2022-jp-3', 'iso2022-jp-ext', 'tcvn5712', 'koi8-r', 'koi8-t', 'koi8-u', 'kz1048', 'hz', 'ptcp154', ] @@ -771,7 +771,7 @@ 'cp932', 'cp949', 'cp950', 'euc-jp', 'euc-jis-2004', 'euc-jisx0213', 'euc-kr', 'gb2312', 'gbk', 'gb18030', - 'iso2022-kr', 'johab', + 'iso2022-kr', 'johab', 'shift-jis', 'shift-jis-2004', 'shift-jisx0213', 'utf-7', ]