[3.6] bpo-20087: Update locale alias mapping with glibc 2.27 supporte… · python/cpython@b1c70d0 (original) (raw)

`@@ -828,6 +828,16 @@ def getpreferredencoding(do_setlocale = True):

`

828

828

`#

`

829

829

`# SS 2014-10-01:

`

830

830

`# Updated alias mapping with glibc 2.19 supported locales.

`

``

831

`+

`

``

832

`+

SS 2018-05-05:

`

``

833

`+

Updated alias mapping with glibc 2.27 supported locales.

`

``

834

`+

`

``

835

`+

These are the differences compared to the old mapping (Python 3.6.5

`

``

836

`+

and older):

`

``

837

`+

`

``

838

`+

updated 'ca_es@valencia' -> 'ca_ES.ISO8859-15@valencia' to 'ca_ES.UTF-8@valencia'

`

``

839

`+

updated 'kk_kz' -> 'kk_KZ.RK1048' to 'kk_KZ.ptcp154'

`

``

840

`+

updated 'russian' -> 'ru_RU.ISO8859-5' to 'ru_RU.KOI8-R'

`

831

841

``

832

842

`locale_alias = {

`

833

843

`'a3': 'az_AZ.KOI8-C',

`

`@@ -838,10 +848,13 @@ def getpreferredencoding(do_setlocale = True):

`

838

848

`'aa_et': 'aa_ET.UTF-8',

`

839

849

`'af': 'af_ZA.ISO8859-1',

`

840

850

`'af_za': 'af_ZA.ISO8859-1',

`

``

851

`+

'agr_pe': 'agr_PE.UTF-8',

`

``

852

`+

'ak_gh': 'ak_GH.UTF-8',

`

841

853

`'am': 'am_ET.UTF-8',

`

842

854

`'am_et': 'am_ET.UTF-8',

`

843

855

`'american': 'en_US.ISO8859-1',

`

844

856

`'an_es': 'an_ES.ISO8859-15',

`

``

857

`+

'anp_in': 'anp_IN.UTF-8',

`

845

858

`'ar': 'ar_AA.ISO8859-6',

`

846

859

`'ar_aa': 'ar_AA.ISO8859-6',

`

847

860

`'ar_ae': 'ar_AE.ISO8859-6',

`

`@@ -859,6 +872,7 @@ def getpreferredencoding(do_setlocale = True):

`

859

872

`'ar_qa': 'ar_QA.ISO8859-6',

`

860

873

`'ar_sa': 'ar_SA.ISO8859-6',

`

861

874

`'ar_sd': 'ar_SD.ISO8859-6',

`

``

875

`+

'ar_ss': 'ar_SS.UTF-8',

`

862

876

`'ar_sy': 'ar_SY.ISO8859-6',

`

863

877

`'ar_tn': 'ar_TN.ISO8859-6',

`

864

878

`'ar_ye': 'ar_YE.ISO8859-6',

`

`@@ -870,6 +884,7 @@ def getpreferredencoding(do_setlocale = True):

`

870

884

`'az': 'az_AZ.ISO8859-9E',

`

871

885

`'az_az': 'az_AZ.ISO8859-9E',

`

872

886

`'az_az.iso88599e': 'az_AZ.ISO8859-9E',

`

``

887

`+

'az_ir': 'az_IR.UTF-8',

`

873

888

`'be': 'be_BY.CP1251',

`

874

889

`'be@latin': 'be_BY.UTF-8@latin',

`

875

890

`'be_bg.utf8': 'bg_BG.UTF-8',

`

`@@ -880,7 +895,10 @@ def getpreferredencoding(do_setlocale = True):

`

880

895

`'ber_ma': 'ber_MA.UTF-8',

`

881

896

`'bg': 'bg_BG.CP1251',

`

882

897

`'bg_bg': 'bg_BG.CP1251',

`

``

898

`+

'bhb_in.utf8': 'bhb_IN.UTF-8',

`

883

899

`'bho_in': 'bho_IN.UTF-8',

`

``

900

`+

'bho_np': 'bho_NP.UTF-8',

`

``

901

`+

'bi_vu': 'bi_VU.UTF-8',

`

884

902

`'bn_bd': 'bn_BD.UTF-8',

`

885

903

`'bn_in': 'bn_IN.UTF-8',

`

886

904

`'bo_cn': 'bo_CN.UTF-8',

`

`@@ -905,13 +923,17 @@ def getpreferredencoding(do_setlocale = True):

`

905

923

`'ca': 'ca_ES.ISO8859-1',

`

906

924

`'ca_ad': 'ca_AD.ISO8859-1',

`

907

925

`'ca_es': 'ca_ES.ISO8859-1',

`

908

``

`-

'ca_es@valencia': 'ca_ES.ISO8859-15@valencia',

`

``

926

`+

'ca_es@valencia': 'ca_ES.UTF-8@valencia',

`

909

927

`'ca_fr': 'ca_FR.ISO8859-1',

`

910

928

`'ca_it': 'ca_IT.ISO8859-1',

`

911

929

`'catalan': 'ca_ES.ISO8859-1',

`

``

930

`+

'ce_ru': 'ce_RU.UTF-8',

`

912

931

`'cextend': 'en_US.ISO8859-1',

`

913

932

`'chinese-s': 'zh_CN.eucCN',

`

914

933

`'chinese-t': 'zh_TW.eucTW',

`

``

934

`+

'chr_us': 'chr_US.UTF-8',

`

``

935

`+

'ckb_iq': 'ckb_IQ.UTF-8',

`

``

936

`+

'cmn_tw': 'cmn_TW.UTF-8',

`

915

937

`'crh_ua': 'crh_UA.UTF-8',

`

916

938

`'croatian': 'hr_HR.ISO8859-2',

`

917

939

`'cs': 'cs_CZ.ISO8859-2',

`

`@@ -933,6 +955,7 @@ def getpreferredencoding(do_setlocale = True):

`

933

955

`'de_be': 'de_BE.ISO8859-1',

`

934

956

`'de_ch': 'de_CH.ISO8859-1',

`

935

957

`'de_de': 'de_DE.ISO8859-1',

`

``

958

`+

'de_it': 'de_IT.ISO8859-1',

`

936

959

`'de_li.utf8': 'de_LI.UTF-8',

`

937

960

`'de_lu': 'de_LU.ISO8859-1',

`

938

961

`'deutsch': 'de_DE.ISO8859-1',

`

`@@ -959,10 +982,12 @@ def getpreferredencoding(do_setlocale = True):

`

959

982

`'en_gb': 'en_GB.ISO8859-1',

`

960

983

`'en_hk': 'en_HK.ISO8859-1',

`

961

984

`'en_ie': 'en_IE.ISO8859-1',

`

``

985

`+

'en_il': 'en_IL.UTF-8',

`

962

986

`'en_in': 'en_IN.ISO8859-1',

`

963

987

`'en_ng': 'en_NG.UTF-8',

`

964

988

`'en_nz': 'en_NZ.ISO8859-1',

`

965

989

`'en_ph': 'en_PH.ISO8859-1',

`

``

990

`+

'en_sc.utf8': 'en_SC.UTF-8',

`

966

991

`'en_sg': 'en_SG.ISO8859-1',

`

967

992

`'en_uk': 'en_GB.ISO8859-1',

`

968

993

`'en_us': 'en_US.ISO8859-1',

`

`@@ -973,6 +998,7 @@ def getpreferredencoding(do_setlocale = True):

`

973

998

`'en_zw.utf8': 'en_ZS.UTF-8',

`

974

999

`'eng_gb': 'en_GB.ISO8859-1',

`

975

1000

`'english': 'en_EN.ISO8859-1',

`

``

1001

`+

'english.iso88591': 'en_US.ISO8859-1',

`

976

1002

`'english_uk': 'en_GB.ISO8859-1',

`

977

1003

`'english_united-states': 'en_US.ISO8859-1',

`

978

1004

`'english_united-states.437': 'C',

`

`@@ -1053,12 +1079,14 @@ def getpreferredencoding(do_setlocale = True):

`

1053

1079

`'gv': 'gv_GB.ISO8859-1',

`

1054

1080

`'gv_gb': 'gv_GB.ISO8859-1',

`

1055

1081

`'ha_ng': 'ha_NG.UTF-8',

`

``

1082

`+

'hak_tw': 'hak_TW.UTF-8',

`

1056

1083

`'he': 'he_IL.ISO8859-8',

`

1057

1084

`'he_il': 'he_IL.ISO8859-8',

`

1058

1085

`'hebrew': 'he_IL.ISO8859-8',

`

1059

1086

`'hi': 'hi_IN.ISCII-DEV',

`

1060

1087

`'hi_in': 'hi_IN.ISCII-DEV',

`

1061

1088

`'hi_in.isciidev': 'hi_IN.ISCII-DEV',

`

``

1089

`+

'hif_fj': 'hif_FJ.UTF-8',

`

1062

1090

`'hne': 'hne_IN.UTF-8',

`

1063

1091

`'hne_in': 'hne_IN.UTF-8',

`

1064

1092

`'hr': 'hr_HR.ISO8859-2',

`

`@@ -1113,7 +1141,8 @@ def getpreferredencoding(do_setlocale = True):

`

1113

1141

`'ka_ge.georgianacademy': 'ka_GE.GEORGIAN-ACADEMY',

`

1114

1142

`'ka_ge.georgianps': 'ka_GE.GEORGIAN-PS',

`

1115

1143

`'ka_ge.georgianrs': 'ka_GE.GEORGIAN-ACADEMY',

`

1116

``

`-

'kk_kz': 'kk_KZ.RK1048',

`

``

1144

`+

'kab_dz': 'kab_DZ.UTF-8',

`

``

1145

`+

'kk_kz': 'kk_KZ.ptcp154',

`

1117

1146

`'kl': 'kl_GL.ISO8859-1',

`

1118

1147

`'kl_gl': 'kl_GL.ISO8859-1',

`

1119

1148

`'km_kh': 'km_KH.UTF-8',

`

`@@ -1139,6 +1168,7 @@ def getpreferredencoding(do_setlocale = True):

`

1139

1168

`'li_nl': 'li_NL.UTF-8',

`

1140

1169

`'lij_it': 'lij_IT.UTF-8',

`

1141

1170

`'lithuanian': 'lt_LT.ISO8859-13',

`

``

1171

`+

'ln_cd': 'ln_CD.UTF-8',

`

1142

1172

`'lo': 'lo_LA.MULELAO-1',

`

1143

1173

`'lo_la': 'lo_LA.MULELAO-1',

`

1144

1174

`'lo_la.cp1133': 'lo_LA.IBM-CP1133',

`

`@@ -1148,13 +1178,18 @@ def getpreferredencoding(do_setlocale = True):

`

1148

1178

`'lt_lt': 'lt_LT.ISO8859-13',

`

1149

1179

`'lv': 'lv_LV.ISO8859-13',

`

1150

1180

`'lv_lv': 'lv_LV.ISO8859-13',

`

``

1181

`+

'lzh_tw': 'lzh_TW.UTF-8',

`

1151

1182

`'mag_in': 'mag_IN.UTF-8',

`

1152

1183

`'mai': 'mai_IN.UTF-8',

`

1153

1184

`'mai_in': 'mai_IN.UTF-8',

`

``

1185

`+

'mai_np': 'mai_NP.UTF-8',

`

``

1186

`+

'mfe_mu': 'mfe_MU.UTF-8',

`

1154

1187

`'mg_mg': 'mg_MG.ISO8859-15',

`

1155

1188

`'mhr_ru': 'mhr_RU.UTF-8',

`

1156

1189

`'mi': 'mi_NZ.ISO8859-1',

`

1157

1190

`'mi_nz': 'mi_NZ.ISO8859-1',

`

``

1191

`+

'miq_ni': 'miq_NI.UTF-8',

`

``

1192

`+

'mjw_in': 'mjw_IN.UTF-8',

`

1158

1193

`'mk': 'mk_MK.ISO8859-5',

`

1159

1194

`'mk_mk': 'mk_MK.ISO8859-5',

`

1160

1195

`'ml': 'ml_IN.UTF-8',

`

`@@ -1168,7 +1203,7 @@ def getpreferredencoding(do_setlocale = True):

`

1168

1203

`'mt': 'mt_MT.ISO8859-3',

`

1169

1204

`'mt_mt': 'mt_MT.ISO8859-3',

`

1170

1205

`'my_mm': 'my_MM.UTF-8',

`

1171

``

`-

'nan_tw@latin': 'nan_TW.UTF-8@latin',

`

``

1206

`+

'nan_tw': 'nan_TW.UTF-8',

`

1172

1207

`'nb': 'nb_NO.ISO8859-1',

`

1173

1208

`'nb_no': 'nb_NO.ISO8859-1',

`

1174

1209

`'nds_de': 'nds_DE.UTF-8',

`

`@@ -1207,6 +1242,8 @@ def getpreferredencoding(do_setlocale = True):

`

1207

1242

`'pa_in': 'pa_IN.UTF-8',

`

1208

1243

`'pa_pk': 'pa_PK.UTF-8',

`

1209

1244

`'pap_an': 'pap_AN.UTF-8',

`

``

1245

`+

'pap_aw': 'pap_AW.UTF-8',

`

``

1246

`+

'pap_cw': 'pap_CW.UTF-8',

`

1210

1247

`'pd': 'pd_US.ISO8859-1',

`

1211

1248

`'pd_de': 'pd_DE.ISO8859-1',

`

1212

1249

`'pd_us': 'pd_US.ISO8859-1',

`

`@@ -1225,14 +1262,16 @@ def getpreferredencoding(do_setlocale = True):

`

1225

1262

`'pt': 'pt_PT.ISO8859-1',

`

1226

1263

`'pt_br': 'pt_BR.ISO8859-1',

`

1227

1264

`'pt_pt': 'pt_PT.ISO8859-1',

`

``

1265

`+

'quz_pe': 'quz_PE.UTF-8',

`

``

1266

`+

'raj_in': 'raj_IN.UTF-8',

`

1228

1267

`'ro': 'ro_RO.ISO8859-2',

`

1229

1268

`'ro_ro': 'ro_RO.ISO8859-2',

`

1230

1269

`'romanian': 'ro_RO.ISO8859-2',

`

1231

1270

`'ru': 'ru_RU.UTF-8',

`

1232

1271

`'ru_ru': 'ru_RU.UTF-8',

`

1233

1272

`'ru_ua': 'ru_UA.KOI8-U',

`

1234

1273

`'rumanian': 'ro_RO.ISO8859-2',

`

1235

``

`-

'russian': 'ru_RU.ISO8859-5',

`

``

1274

`+

'russian': 'ru_RU.KOI8-R',

`

1236

1275

`'rw': 'rw_RW.ISO8859-1',

`

1237

1276

`'rw_rw': 'rw_RW.ISO8859-1',

`

1238

1277

`'sa_in': 'sa_IN.UTF-8',

`

`@@ -1244,12 +1283,14 @@ def getpreferredencoding(do_setlocale = True):

`

1244

1283

`'sd_pk': 'sd_PK.UTF-8',

`

1245

1284

`'se_no': 'se_NO.UTF-8',

`

1246

1285

`'serbocroatian': 'sr_RS.UTF-8@latin',

`

``

1286

`+

'sgs_lt': 'sgs_LT.UTF-8',

`

1247

1287

`'sh': 'sr_RS.UTF-8@latin',

`

1248

1288

`'sh_ba.iso88592@bosnia': 'sr_CS.ISO8859-2',

`

1249

1289

`'sh_hr': 'sh_HR.ISO8859-2',

`

1250

1290

`'sh_hr.iso88592': 'hr_HR.ISO8859-2',

`

1251

1291

`'sh_sp': 'sr_CS.ISO8859-2',

`

1252

1292

`'sh_yu': 'sr_RS.UTF-8@latin',

`

``

1293

`+

'shn_mm': 'shn_MM.UTF-8',

`

1253

1294

`'shs_ca': 'shs_CA.UTF-8',

`

1254

1295

`'si': 'si_LK.UTF-8',

`

1255

1296

`'si_lk': 'si_LK.UTF-8',

`

`@@ -1263,6 +1304,7 @@ def getpreferredencoding(do_setlocale = True):

`

1263

1304

`'slovak': 'sk_SK.ISO8859-2',

`

1264

1305

`'slovene': 'sl_SI.ISO8859-2',

`

1265

1306

`'slovenian': 'sl_SI.ISO8859-2',

`

``

1307

`+

'sm_ws': 'sm_WS.UTF-8',

`

1266

1308

`'so_dj': 'so_DJ.ISO8859-1',

`

1267

1309

`'so_et': 'so_ET.UTF-8',

`

1268

1310

`'so_ke': 'so_KE.ISO8859-1',

`

`@@ -1309,6 +1351,7 @@ def getpreferredencoding(do_setlocale = True):

`

1309

1351

`'ta_in.tscii': 'ta_IN.TSCII-0',

`

1310

1352

`'ta_in.tscii0': 'ta_IN.TSCII-0',

`

1311

1353

`'ta_lk': 'ta_LK.UTF-8',

`

``

1354

`+

'tcy_in.utf8': 'tcy_IN.UTF-8',

`

1312

1355

`'te': 'te_IN.UTF-8',

`

1313

1356

`'te_in': 'te_IN.UTF-8',

`

1314

1357

`'tg': 'tg_TJ.KOI8-C',

`

`@@ -1318,6 +1361,7 @@ def getpreferredencoding(do_setlocale = True):

`

1318

1361

`'th_th.tactis': 'th_TH.TIS620',

`

1319

1362

`'th_th.tis620': 'th_TH.TIS620',

`

1320

1363

`'thai': 'th_TH.ISO8859-11',

`

``

1364

`+

'the_np': 'the_NP.UTF-8',

`

1321

1365

`'ti_er': 'ti_ER.UTF-8',

`

1322

1366

`'ti_et': 'ti_ET.UTF-8',

`

1323

1367

`'tig_er': 'tig_ER.UTF-8',

`

`@@ -1326,6 +1370,8 @@ def getpreferredencoding(do_setlocale = True):

`

1326

1370

`'tl_ph': 'tl_PH.ISO8859-1',

`

1327

1371

`'tn': 'tn_ZA.ISO8859-15',

`

1328

1372

`'tn_za': 'tn_ZA.ISO8859-15',

`

``

1373

`+

'to_to': 'to_TO.UTF-8',

`

``

1374

`+

'tpi_pg': 'tpi_PG.UTF-8',

`

1329

1375

`'tr': 'tr_TR.ISO8859-9',

`

1330

1376

`'tr_cy': 'tr_CY.ISO8859-9',

`

1331

1377

`'tr_tr': 'tr_TR.ISO8859-9',

`

`@@ -1368,6 +1414,7 @@ def getpreferredencoding(do_setlocale = True):

`

1368

1414

`'yi_us': 'yi_US.CP1255',

`

1369

1415

`'yo_ng': 'yo_NG.UTF-8',

`

1370

1416

`'yue_hk': 'yue_HK.UTF-8',

`

``

1417

`+

'yuw_pg': 'yuw_PG.UTF-8',

`

1371

1418

`'zh': 'zh_CN.eucCN',

`

1372

1419

`'zh_cn': 'zh_CN.gb2312',

`

1373

1420

`'zh_cn.big5': 'zh_TW.big5',

`