Skip to content

Commit 49f4ecf

Browse files
serhiy-storchakaserhiy-storchaka
authored
gh-149891: Add more encoding aliases (GH-149892)
Support all aliases officially registered in IANA, except Extended_UNIX_Code_Packed_Format_for_Japanese. New names: KSC_5601, KS_C_5601-1989, iso-ir-149, GB_2312-80, windows-936, mac, CCSID00858, CCSID01140, and a number of "cs"-prefixed names. Fix csHPRoman8, which was not normalized.
1 parent e4db68b commit 49f4ecf

2 files changed

Lines changed: 53 additions & 5 deletions

File tree

‎Lib/encodings/aliases.py‎

Lines changed: 52 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343

4444
# big5hkscs codec
4545
'big5_hkscs' : 'big5hkscs',
46+
'csbig5hkscs' : 'big5hkscs',
4647
'hkscs' : 'big5hkscs',
4748

4849
# bz2_codec codec
@@ -71,6 +72,7 @@
7172

7273
# cp1140 codec
7374
'1140' : 'cp1140',
75+
'ccsid01140' : 'cp1140',
7476
'cp01140' : 'cp1140',
7577
'csibm01140' : 'cp1140',
7678
'ebcdic_us_37_euro' : 'cp1140',
@@ -79,38 +81,47 @@
7981

8082
# cp1250 codec
8183
'1250' : 'cp1250',
84+
'cswindows1250' : 'cp1250',
8285
'windows_1250' : 'cp1250',
8386

8487
# cp1251 codec
8588
'1251' : 'cp1251',
89+
'cswindows1251' : 'cp1251',
8690
'windows_1251' : 'cp1251',
8791

8892
# cp1252 codec
8993
'1252' : 'cp1252',
94+
'cswindows1252' : 'cp1252',
9095
'windows_1252' : 'cp1252',
9196

9297
# cp1253 codec
9398
'1253' : 'cp1253',
99+
'cswindows1253' : 'cp1253',
94100
'windows_1253' : 'cp1253',
95101

96102
# cp1254 codec
97103
'1254' : 'cp1254',
104+
'cswindows1254' : 'cp1254',
98105
'windows_1254' : 'cp1254',
99106

100107
# cp1255 codec
101108
'1255' : 'cp1255',
109+
'cswindows1255' : 'cp1255',
102110
'windows_1255' : 'cp1255',
103111

104112
# cp1256 codec
105113
'1256' : 'cp1256',
114+
'cswindows1256' : 'cp1256',
106115
'windows_1256' : 'cp1256',
107116

108117
# cp1257 codec
109118
'1257' : 'cp1257',
119+
'cswindows1257' : 'cp1257',
110120
'windows_1257' : 'cp1257',
111121

112122
# cp1258 codec
113123
'1258' : 'cp1258',
124+
'cswindows1258' : 'cp1258',
114125
'windows_1258' : 'cp1258',
115126

116127
# cp273 codec
@@ -163,6 +174,7 @@
163174

164175
# cp858 codec
165176
'858' : 'cp858',
177+
'ccsid00858' : 'cp858',
166178
'cp00858' : 'cp858',
167179
'csibm00858' : 'cp858',
168180
'csibm858' : 'cp858',
@@ -214,22 +226,28 @@
214226

215227
# cp874 codec
216228
'874' : 'cp874',
229+
'cswindows874' : 'cp874',
217230
'ms874' : 'cp874',
218231
'windows_874' : 'cp874',
219232

220233
# cp932 codec
221234
'932' : 'cp932',
235+
'cswindows31j' : 'cp932',
222236
'ms932' : 'cp932',
223237
'mskanji' : 'cp932',
224238
'ms_kanji' : 'cp932',
225239
'windows_31j' : 'cp932',
226240

227241
# cp949 codec
228242
'949' : 'cp949',
243+
'csksc56011987' : 'cp949',
244+
'iso_ir_149' : 'cp949',
229245
'korean' : 'cp949',
246+
'ks_c_5601_1987' : 'cp949',
247+
'ks_c_5601_1989' : 'cp949',
230248
'ksc5601' : 'cp949',
231249
'ks_c_5601' : 'cp949',
232-
'ks_c_5601_1987' : 'cp949',
250+
'ksc_5601' : 'cp949',
233251
'ksx1001' : 'cp949',
234252
'ks_x_1001' : 'cp949',
235253
'ms949' : 'cp949',
@@ -248,41 +266,47 @@
248266
'eucjisx0213' : 'euc_jisx0213',
249267

250268
# euc_jp codec
269+
'cseucpkdfmtjapanese' : 'euc_jp',
251270
'eucjp' : 'euc_jp',
252271
'ujis' : 'euc_jp',
253272
'u_jis' : 'euc_jp',
254273

255274
# euc_kr codec
256-
'euckr' : 'euc_kr',
257275
'cseuckr' : 'euc_kr',
276+
'euckr' : 'euc_kr',
258277

259278
# gb18030 codec
279+
'csgb18030' : 'gb18030',
260280
'gb18030_2000' : 'gb18030',
261281

262282
# gb2312 codec
263283
'chinese' : 'gb2312',
284+
'csgb2312' : 'gb2312',
264285
'csiso58gb231280' : 'gb2312',
265286
'euc_cn' : 'gb2312',
266287
'euccn' : 'gb2312',
267288
'eucgb2312_cn' : 'gb2312',
268289
'gb2312_1980' : 'gb2312',
269290
'gb2312_80' : 'gb2312',
291+
'gb_2312_80' : 'gb2312',
270292
'iso_ir_58' : 'gb2312',
271293

272294
# gbk codec
273295
'936' : 'gbk',
274296
'cp936' : 'gbk',
297+
'csgbk' : 'gbk',
275298
'ms936' : 'gbk',
299+
'windows_936' : 'gbk',
276300

277301
# hex_codec codec
278302
'hex' : 'hex_codec',
279303

280304
# hp_roman8 codec
281-
'roman8' : 'hp_roman8',
282-
'r8' : 'hp_roman8',
283-
'csHPRoman8' : 'hp_roman8',
284305
'cp1051' : 'hp_roman8',
306+
'cshproman8' : 'hp_roman8',
285307
'ibm1051' : 'hp_roman8',
308+
'r8' : 'hp_roman8',
309+
'roman8' : 'hp_roman8',
286310

287311
# hz codec
288312
'hzgb' : 'hz',
@@ -299,6 +323,7 @@
299323
'iso_2022_jp_1' : 'iso2022_jp_1',
300324

301325
# iso2022_jp_2 codec
326+
'csiso2022jp2' : 'iso2022_jp_2',
302327
'iso2022jp_2' : 'iso2022_jp_2',
303328
'iso_2022_jp_2' : 'iso2022_jp_2',
304329

@@ -334,12 +359,14 @@
334359
'iso_8859_11_2001' : 'iso8859_11',
335360

336361
# iso8859_13 codec
362+
'csiso885913' : 'iso8859_13',
337363
'iso_8859_13' : 'iso8859_13',
338364
'l7' : 'iso8859_13',
339365
'latin7' : 'iso8859_13',
340366
'latin_7' : 'iso8859_13',
341367

342368
# iso8859_14 codec
369+
'csiso885914' : 'iso8859_14',
343370
'iso_8859_14' : 'iso8859_14',
344371
'iso_8859_14_1998' : 'iso8859_14',
345372
'iso_celtic' : 'iso8859_14',
@@ -349,12 +376,14 @@
349376
'latin_8' : 'iso8859_14',
350377

351378
# iso8859_15 codec
379+
'csiso885915' : 'iso8859_15',
352380
'iso_8859_15' : 'iso8859_15',
353381
'l9' : 'iso8859_15',
354382
'latin9' : 'iso8859_15',
355383
'latin_9' : 'iso8859_15',
356384

357385
# iso8859_16 codec
386+
'csiso885916' : 'iso8859_16',
358387
'iso_8859_16' : 'iso8859_16',
359388
'iso_8859_16_2001' : 'iso8859_16',
360389
'iso_ir_226' : 'iso8859_16',
@@ -416,6 +445,8 @@
416445
'iso_ir_126' : 'iso8859_7',
417446

418447
# iso8859_8 codec
448+
'csiso88598e' : 'iso8859_8',
449+
'csiso88598i' : 'iso8859_8',
419450
'csisolatinhebrew' : 'iso8859_8',
420451
'hebrew' : 'iso8859_8',
421452
'iso_8859_8' : 'iso8859_8',
@@ -440,7 +471,11 @@
440471
# koi8_r codec
441472
'cskoi8r' : 'koi8_r',
442473

474+
# koi8_u codec
475+
'cskoi8u' : 'koi8_u',
476+
443477
# kz1048 codec
478+
'cskz1048' : 'kz1048',
444479
'kz_1048' : 'kz1048',
445480
'rk1048' : 'kz1048',
446481
'strk1048_2002' : 'kz1048',
@@ -480,7 +515,9 @@
480515
'maclatin2' : 'mac_latin2',
481516

482517
# mac_roman codec
518+
'csmacintosh' : 'mac_roman',
483519
'macintosh' : 'mac_roman',
520+
'mac' : 'mac_roman',
484521
'macroman' : 'mac_roman',
485522

486523
# mac_turkish codec
@@ -521,40 +558,50 @@
521558
's_jisx0213' : 'shift_jisx0213',
522559

523560
# tis_620 codec
561+
'cstis620' : 'tis_620',
524562
'tis620' : 'tis_620',
525563
'tis_620_0' : 'tis_620',
526564
'tis_620_2529_0' : 'tis_620',
527565
'tis_620_2529_1' : 'tis_620',
528566
'iso_ir_166' : 'tis_620',
529567

530568
# utf_16 codec
569+
'csutf16' : 'utf_16',
531570
'u16' : 'utf_16',
532571
'utf16' : 'utf_16',
533572

534573
# utf_16_be codec
574+
'csutf16be' : 'utf_16_be',
535575
'unicodebigunmarked' : 'utf_16_be',
536576
'utf_16be' : 'utf_16_be',
537577

538578
# utf_16_le codec
579+
'csutf16le' : 'utf_16_le',
539580
'unicodelittleunmarked' : 'utf_16_le',
540581
'utf_16le' : 'utf_16_le',
541582

542583
# utf_32 codec
584+
'csutf32' : 'utf_32',
543585
'u32' : 'utf_32',
544586
'utf32' : 'utf_32',
545587

546588
# utf_32_be codec
589+
'csutf32be' : 'utf_32_be',
547590
'utf_32be' : 'utf_32_be',
548591

549592
# utf_32_le codec
593+
'csutf32le' : 'utf_32_le',
550594
'utf_32le' : 'utf_32_le',
551595

552596
# utf_7 codec
597+
'csunicode11utf7' : 'utf_7',
598+
'csutf7' : 'utf_7',
553599
'u7' : 'utf_7',
554600
'utf7' : 'utf_7',
555601
'unicode_1_1_utf_7' : 'utf_7',
556602

557603
# utf_8 codec
604+
'csutf8' : 'utf_8',
558605
'u8' : 'utf_8',
559606
'utf' : 'utf_8',
560607
'utf8' : 'utf_8',

‎Misc/NEWS.d/next/Library/2026-05-15-19-52-41.gh-issue-149891.BJUIGB.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add support for more encoding aliases `officially registered in IANA <https://www.iana.org/assignments/character-sets/character-sets.xhtml>`__.

0 commit comments

Comments
 (0)