[2.7] bpo-20087: Update locale alias mapping with glibc 2.27 supporte… · python/cpython@a55ac80 (original) (raw)
`@@ -798,6 +798,17 @@ def getpreferredencoding(do_setlocale = True):
`
798
798
`#
`
799
799
`# SS 2014-10-01:
`
800
800
`# Updated alias mapping with glibc 2.19 supported locales.
`
``
801
`+
`
``
802
`+
SS 2018-05-05:
`
``
803
`+
Updated alias mapping with glibc 2.27 supported locales.
`
``
804
`+
`
``
805
`+
These are the differences compared to the old mapping (Python 2.7.15
`
``
806
`+
and older):
`
``
807
`+
`
``
808
`+
updated 'ca_es@valencia' -> 'ca_ES.ISO8859-15@valencia' to 'ca_ES.UTF-8@valencia'
`
``
809
`+
updated 'english.iso88591' -> 'en_EN.ISO8859-1' to 'en_US.ISO8859-1'
`
``
810
`+
updated 'kk_kz' -> 'kk_KZ.RK1048' to 'kk_KZ.ptcp154'
`
``
811
`+
updated 'russian' -> 'ru_RU.ISO8859-5' to 'ru_RU.KOI8-R'
`
801
812
``
802
813
`locale_alias = {
`
803
814
`'a3': 'az_AZ.KOI8-C',
`
`@@ -810,11 +821,14 @@ def getpreferredencoding(do_setlocale = True):
`
810
821
`'af': 'af_ZA.ISO8859-1',
`
811
822
`'af_za': 'af_ZA.ISO8859-1',
`
812
823
`'af_za.iso88591': 'af_ZA.ISO8859-1',
`
``
824
`+
'agr_pe': 'agr_PE.UTF-8',
`
``
825
`+
'ak_gh': 'ak_GH.UTF-8',
`
813
826
`'am': 'am_ET.UTF-8',
`
814
827
`'am_et': 'am_ET.UTF-8',
`
815
828
`'american': 'en_US.ISO8859-1',
`
816
829
`'american.iso88591': 'en_US.ISO8859-1',
`
817
830
`'an_es': 'an_ES.ISO8859-15',
`
``
831
`+
'anp_in': 'anp_IN.UTF-8',
`
818
832
`'ar': 'ar_AA.ISO8859-6',
`
819
833
`'ar_aa': 'ar_AA.ISO8859-6',
`
820
834
`'ar_aa.iso88596': 'ar_AA.ISO8859-6',
`
`@@ -847,6 +861,7 @@ def getpreferredencoding(do_setlocale = True):
`
847
861
`'ar_sa.iso88596': 'ar_SA.ISO8859-6',
`
848
862
`'ar_sd': 'ar_SD.ISO8859-6',
`
849
863
`'ar_sd.iso88596': 'ar_SD.ISO8859-6',
`
``
864
`+
'ar_ss': 'ar_SS.UTF-8',
`
850
865
`'ar_sy': 'ar_SY.ISO8859-6',
`
851
866
`'ar_sy.iso88596': 'ar_SY.ISO8859-6',
`
852
867
`'ar_tn': 'ar_TN.ISO8859-6',
`
`@@ -862,6 +877,7 @@ def getpreferredencoding(do_setlocale = True):
`
862
877
`'az': 'az_AZ.ISO8859-9E',
`
863
878
`'az_az': 'az_AZ.ISO8859-9E',
`
864
879
`'az_az.iso88599e': 'az_AZ.ISO8859-9E',
`
``
880
`+
'az_ir': 'az_IR.UTF-8',
`
865
881
`'be': 'be_BY.CP1251',
`
866
882
`'be@latin': 'be_BY.UTF-8@latin',
`
867
883
`'be_bg.utf8': 'bg_BG.UTF-8',
`
`@@ -879,7 +895,10 @@ def getpreferredencoding(do_setlocale = True):
`
879
895
`'bg_bg.iso88595': 'bg_BG.ISO8859-5',
`
880
896
`'bg_bg.koi8r': 'bg_BG.KOI8-R',
`
881
897
`'bg_bg.microsoftcp1251': 'bg_BG.CP1251',
`
``
898
`+
'bhb_in.utf8': 'bhb_IN.UTF-8',
`
882
899
`'bho_in': 'bho_IN.UTF-8',
`
``
900
`+
'bho_np': 'bho_NP.UTF-8',
`
``
901
`+
'bi_vu': 'bi_VU.UTF-8',
`
883
902
`'bn_bd': 'bn_BD.UTF-8',
`
884
903
`'bn_in': 'bn_IN.UTF-8',
`
885
904
`'bo_cn': 'bo_CN.UTF-8',
`
`@@ -921,8 +940,8 @@ def getpreferredencoding(do_setlocale = True):
`
921
940
`'ca_es.iso885915': 'ca_ES.ISO8859-15',
`
922
941
`'ca_es.iso885915@euro': 'ca_ES.ISO8859-15',
`
923
942
`'ca_es.utf8@euro': 'ca_ES.UTF-8',
`
924
``
`-
'ca_es@valencia': 'ca_ES.ISO8859-15@valencia',
`
925
943
`'ca_es@euro': 'ca_ES.ISO8859-15',
`
``
944
`+
'ca_es@valencia': 'ca_ES.UTF-8@valencia',
`
926
945
`'ca_fr': 'ca_FR.ISO8859-1',
`
927
946
`'ca_fr.iso88591': 'ca_FR.ISO8859-1',
`
928
947
`'ca_fr.iso885915': 'ca_FR.ISO8859-15',
`
`@@ -936,10 +955,14 @@ def getpreferredencoding(do_setlocale = True):
`
936
955
`'ca_it.utf8@euro': 'ca_IT.UTF-8',
`
937
956
`'ca_it@euro': 'ca_IT.ISO8859-15',
`
938
957
`'catalan': 'ca_ES.ISO8859-1',
`
``
958
`+
'ce_ru': 'ce_RU.UTF-8',
`
939
959
`'cextend': 'en_US.ISO8859-1',
`
940
960
`'cextend.en': 'en_US.ISO8859-1',
`
941
961
`'chinese-s': 'zh_CN.eucCN',
`
942
962
`'chinese-t': 'zh_TW.eucTW',
`
``
963
`+
'chr_us': 'chr_US.UTF-8',
`
``
964
`+
'ckb_iq': 'ckb_IQ.UTF-8',
`
``
965
`+
'cmn_tw': 'cmn_TW.UTF-8',
`
943
966
`'crh_ua': 'crh_UA.UTF-8',
`
944
967
`'croatian': 'hr_HR.ISO8859-2',
`
945
968
`'cs': 'cs_CZ.ISO8859-2',
`
`@@ -996,6 +1019,7 @@ def getpreferredencoding(do_setlocale = True):
`
996
1019
`'de_de.iso885915@euro': 'de_DE.ISO8859-15',
`
997
1020
`'de_de.utf8@euro': 'de_DE.UTF-8',
`
998
1021
`'de_de@euro': 'de_DE.ISO8859-15',
`
``
1022
`+
'de_it': 'de_IT.ISO8859-1',
`
999
1023
`'de_li.utf8': 'de_LI.UTF-8',
`
1000
1024
`'de_lu': 'de_LU.ISO8859-1',
`
1001
1025
`'de_lu.iso88591': 'de_LU.ISO8859-1',
`
`@@ -1030,6 +1054,8 @@ def getpreferredencoding(do_setlocale = True):
`
1030
1054
`'en_ca': 'en_CA.ISO8859-1',
`
1031
1055
`'en_ca.iso88591': 'en_CA.ISO8859-1',
`
1032
1056
`'en_dk': 'en_DK.ISO8859-1',
`
``
1057
`+
'en_dk.iso88591': 'en_DK.ISO8859-1',
`
``
1058
`+
'en_dk.iso885915': 'en_DK.ISO8859-15',
`
1033
1059
`'en_dl.utf8': 'en_DL.UTF-8',
`
1034
1060
`'en_gb': 'en_GB.ISO8859-1',
`
1035
1061
`'en_gb.88591': 'en_GB.ISO8859-1',
`
`@@ -1044,12 +1070,14 @@ def getpreferredencoding(do_setlocale = True):
`
1044
1070
`'en_ie.iso885915@euro': 'en_IE.ISO8859-15',
`
1045
1071
`'en_ie.utf8@euro': 'en_IE.UTF-8',
`
1046
1072
`'en_ie@euro': 'en_IE.ISO8859-15',
`
``
1073
`+
'en_il': 'en_IL.UTF-8',
`
1047
1074
`'en_in': 'en_IN.ISO8859-1',
`
1048
1075
`'en_ng': 'en_NG.UTF-8',
`
1049
1076
`'en_nz': 'en_NZ.ISO8859-1',
`
1050
1077
`'en_nz.iso88591': 'en_NZ.ISO8859-1',
`
1051
1078
`'en_ph': 'en_PH.ISO8859-1',
`
1052
1079
`'en_ph.iso88591': 'en_PH.ISO8859-1',
`
``
1080
`+
'en_sc.utf8': 'en_SC.UTF-8',
`
1053
1081
`'en_sg': 'en_SG.ISO8859-1',
`
1054
1082
`'en_sg.iso88591': 'en_SG.ISO8859-1',
`
1055
1083
`'en_uk': 'en_GB.ISO8859-1',
`
`@@ -1073,7 +1101,7 @@ def getpreferredencoding(do_setlocale = True):
`
1073
1101
`'eng_gb': 'en_GB.ISO8859-1',
`
1074
1102
`'eng_gb.8859': 'en_GB.ISO8859-1',
`
1075
1103
`'english': 'en_EN.ISO8859-1',
`
1076
``
`-
'english.iso88591': 'en_EN.ISO8859-1',
`
``
1104
`+
'english.iso88591': 'en_US.ISO8859-1',
`
1077
1105
`'english_uk': 'en_GB.ISO8859-1',
`
1078
1106
`'english_uk.8859': 'en_GB.ISO8859-1',
`
1079
1107
`'english_united-states': 'en_US.ISO8859-1',
`
`@@ -1268,6 +1296,7 @@ def getpreferredencoding(do_setlocale = True):
`
1268
1296
`'gv_gb.iso885915': 'gv_GB.ISO8859-15',
`
1269
1297
`'gv_gb@euro': 'gv_GB.ISO8859-15',
`
1270
1298
`'ha_ng': 'ha_NG.UTF-8',
`
``
1299
`+
'hak_tw': 'hak_TW.UTF-8',
`
1271
1300
`'he': 'he_IL.ISO8859-8',
`
1272
1301
`'he_il': 'he_IL.ISO8859-8',
`
1273
1302
`'he_il.cp1255': 'he_IL.CP1255',
`
`@@ -1278,6 +1307,7 @@ def getpreferredencoding(do_setlocale = True):
`
1278
1307
`'hi': 'hi_IN.ISCII-DEV',
`
1279
1308
`'hi_in': 'hi_IN.ISCII-DEV',
`
1280
1309
`'hi_in.isciidev': 'hi_IN.ISCII-DEV',
`
``
1310
`+
'hif_fj': 'hif_FJ.UTF-8',
`
1281
1311
`'hne': 'hne_IN.UTF-8',
`
1282
1312
`'hne_in': 'hne_IN.UTF-8',
`
1283
1313
`'hr': 'hr_HR.ISO8859-2',
`
`@@ -1361,7 +1391,8 @@ def getpreferredencoding(do_setlocale = True):
`
1361
1391
`'ka_ge.georgianacademy': 'ka_GE.GEORGIAN-ACADEMY',
`
1362
1392
`'ka_ge.georgianps': 'ka_GE.GEORGIAN-PS',
`
1363
1393
`'ka_ge.georgianrs': 'ka_GE.GEORGIAN-ACADEMY',
`
1364
``
`-
'kk_kz': 'kk_KZ.RK1048',
`
``
1394
`+
'kab_dz': 'kab_DZ.UTF-8',
`
``
1395
`+
'kk_kz': 'kk_KZ.ptcp154',
`
1365
1396
`'kl': 'kl_GL.ISO8859-1',
`
1366
1397
`'kl_gl': 'kl_GL.ISO8859-1',
`
1367
1398
`'kl_gl.iso88591': 'kl_GL.ISO8859-1',
`
`@@ -1379,6 +1410,7 @@ def getpreferredencoding(do_setlocale = True):
`
1379
1410
`'korean.euc': 'ko_KR.eucKR',
`
1380
1411
`'ks': 'ks_IN.UTF-8',
`
1381
1412
`'ks_in': 'ks_IN.UTF-8',
`
``
1413
`+
'ks_in.utf8@devanagari': 'ks_IN.UTF-8@devanagari',
`
1382
1414
`'ks_in@devanagari': 'ks_IN.UTF-8@devanagari',
`
1383
1415
`'ks_in@devanagari.utf8': 'ks_IN.UTF-8@devanagari',
`
1384
1416
`'ku_tr': 'ku_TR.ISO8859-9',
`
`@@ -1396,6 +1428,7 @@ def getpreferredencoding(do_setlocale = True):
`
1396
1428
`'li_nl': 'li_NL.UTF-8',
`
1397
1429
`'lij_it': 'lij_IT.UTF-8',
`
1398
1430
`'lithuanian': 'lt_LT.ISO8859-13',
`
``
1431
`+
'ln_cd': 'ln_CD.UTF-8',
`
1399
1432
`'lo': 'lo_LA.MULELAO-1',
`
1400
1433
`'lo_la': 'lo_LA.MULELAO-1',
`
1401
1434
`'lo_la.cp1133': 'lo_LA.IBM-CP1133',
`
`@@ -1409,14 +1442,19 @@ def getpreferredencoding(do_setlocale = True):
`
1409
1442
`'lv_lv': 'lv_LV.ISO8859-13',
`
1410
1443
`'lv_lv.iso885913': 'lv_LV.ISO8859-13',
`
1411
1444
`'lv_lv.iso88594': 'lv_LV.ISO8859-4',
`
``
1445
`+
'lzh_tw': 'lzh_TW.UTF-8',
`
1412
1446
`'mag_in': 'mag_IN.UTF-8',
`
1413
1447
`'mai': 'mai_IN.UTF-8',
`
1414
1448
`'mai_in': 'mai_IN.UTF-8',
`
``
1449
`+
'mai_np': 'mai_NP.UTF-8',
`
``
1450
`+
'mfe_mu': 'mfe_MU.UTF-8',
`
1415
1451
`'mg_mg': 'mg_MG.ISO8859-15',
`
1416
1452
`'mhr_ru': 'mhr_RU.UTF-8',
`
1417
1453
`'mi': 'mi_NZ.ISO8859-1',
`
1418
1454
`'mi_nz': 'mi_NZ.ISO8859-1',
`
1419
1455
`'mi_nz.iso88591': 'mi_NZ.ISO8859-1',
`
``
1456
`+
'miq_ni': 'miq_NI.UTF-8',
`
``
1457
`+
'mjw_in': 'mjw_IN.UTF-8',
`
1420
1458
`'mk': 'mk_MK.ISO8859-5',
`
1421
1459
`'mk_mk': 'mk_MK.ISO8859-5',
`
1422
1460
`'mk_mk.cp1251': 'mk_MK.CP1251',
`
`@@ -1435,7 +1473,7 @@ def getpreferredencoding(do_setlocale = True):
`
1435
1473
`'mt_mt': 'mt_MT.ISO8859-3',
`
1436
1474
`'mt_mt.iso88593': 'mt_MT.ISO8859-3',
`
1437
1475
`'my_mm': 'my_MM.UTF-8',
`
1438
``
`-
'nan_tw@latin': 'nan_TW.UTF-8@latin',
`
``
1476
`+
'nan_tw': 'nan_TW.UTF-8',
`
1439
1477
`'nb': 'nb_NO.ISO8859-1',
`
1440
1478
`'nb_no': 'nb_NO.ISO8859-1',
`
1441
1479
`'nb_no.88591': 'nb_NO.ISO8859-1',
`
`@@ -1509,6 +1547,8 @@ def getpreferredencoding(do_setlocale = True):
`
1509
1547
`'pa_in': 'pa_IN.UTF-8',
`
1510
1548
`'pa_pk': 'pa_PK.UTF-8',
`
1511
1549
`'pap_an': 'pap_AN.UTF-8',
`
``
1550
`+
'pap_aw': 'pap_AW.UTF-8',
`
``
1551
`+
'pap_cw': 'pap_CW.UTF-8',
`
1512
1552
`'pd': 'pd_US.ISO8859-1',
`
1513
1553
`'pd_de': 'pd_DE.ISO8859-1',
`
1514
1554
`'pd_de.iso88591': 'pd_DE.ISO8859-1',
`
`@@ -1549,6 +1589,8 @@ def getpreferredencoding(do_setlocale = True):
`
1549
1589
`'pt_pt.iso885915@euro': 'pt_PT.ISO8859-15',
`
1550
1590
`'pt_pt.utf8@euro': 'pt_PT.UTF-8',
`
1551
1591
`'pt_pt@euro': 'pt_PT.ISO8859-15',
`
``
1592
`+
'quz_pe': 'quz_PE.UTF-8',
`
``
1593
`+
'raj_in': 'raj_IN.UTF-8',
`
1552
1594
`'ro': 'ro_RO.ISO8859-2',
`
1553
1595
`'ro_ro': 'ro_RO.ISO8859-2',
`
1554
1596
`'ro_ro.iso88592': 'ro_RO.ISO8859-2',
`
`@@ -1565,7 +1607,7 @@ def getpreferredencoding(do_setlocale = True):
`
1565
1607
`'ru_ua.koi8u': 'ru_UA.KOI8-U',
`
1566
1608
`'ru_ua.microsoftcp1251': 'ru_UA.CP1251',
`
1567
1609
`'rumanian': 'ro_RO.ISO8859-2',
`
1568
``
`-
'russian': 'ru_RU.ISO8859-5',
`
``
1610
`+
'russian': 'ru_RU.KOI8-R',
`
1569
1611
`'rw': 'rw_RW.ISO8859-1',
`
1570
1612
`'rw_rw': 'rw_RW.ISO8859-1',
`
1571
1613
`'rw_rw.iso88591': 'rw_RW.ISO8859-1',
`
`@@ -1575,17 +1617,20 @@ def getpreferredencoding(do_setlocale = True):
`
1575
1617
`'sd': 'sd_IN.UTF-8',
`
1576
1618
`'sd@devanagari': 'sd_IN.UTF-8@devanagari',
`
1577
1619
`'sd_in': 'sd_IN.UTF-8',
`
``
1620
`+
'sd_in.utf8@devanagari': 'sd_IN.UTF-8@devanagari',
`
1578
1621
`'sd_in@devanagari': 'sd_IN.UTF-8@devanagari',
`
1579
1622
`'sd_in@devanagari.utf8': 'sd_IN.UTF-8@devanagari',
`
1580
1623
`'sd_pk': 'sd_PK.UTF-8',
`
1581
1624
`'se_no': 'se_NO.UTF-8',
`
1582
1625
`'serbocroatian': 'sr_RS.UTF-8@latin',
`
``
1626
`+
'sgs_lt': 'sgs_LT.UTF-8',
`
1583
1627
`'sh': 'sr_RS.UTF-8@latin',
`
1584
1628
`'sh_ba.iso88592@bosnia': 'sr_CS.ISO8859-2',
`
1585
1629
`'sh_hr': 'sh_HR.ISO8859-2',
`
1586
1630
`'sh_hr.iso88592': 'hr_HR.ISO8859-2',
`
1587
1631
`'sh_sp': 'sr_CS.ISO8859-2',
`
1588
1632
`'sh_yu': 'sr_RS.UTF-8@latin',
`
``
1633
`+
'shn_mm': 'shn_MM.UTF-8',
`
1589
1634
`'shs_ca': 'shs_CA.UTF-8',
`
1590
1635
`'si': 'si_LK.UTF-8',
`
1591
1636
`'si_lk': 'si_LK.UTF-8',
`
`@@ -1601,6 +1646,7 @@ def getpreferredencoding(do_setlocale = True):
`
1601
1646
`'slovak': 'sk_SK.ISO8859-2',
`
1602
1647
`'slovene': 'sl_SI.ISO8859-2',
`
1603
1648
`'slovenian': 'sl_SI.ISO8859-2',
`
``
1649
`+
'sm_ws': 'sm_WS.UTF-8',
`
1604
1650
`'so_dj': 'so_DJ.ISO8859-1',
`
1605
1651
`'so_et': 'so_ET.UTF-8',
`
1606
1652
`'so_ke': 'so_KE.ISO8859-1',
`
`@@ -1627,6 +1673,7 @@ def getpreferredencoding(do_setlocale = True):
`
1627
1673
`'sr_cs@latn': 'sr_CS.UTF-8@latin',
`
1628
1674
`'sr_me': 'sr_ME.UTF-8',
`
1629
1675
`'sr_rs': 'sr_RS.UTF-8',
`
``
1676
`+
'sr_rs.utf8@latn': 'sr_RS.UTF-8@latin',
`
1630
1677
`'sr_rs@latin': 'sr_RS.UTF-8@latin',
`
1631
1678
`'sr_rs@latn': 'sr_RS.UTF-8@latin',
`
1632
1679
`'sr_sp': 'sr_CS.ISO8859-2',
`
`@@ -1668,6 +1715,7 @@ def getpreferredencoding(do_setlocale = True):
`
1668
1715
`'ta_in.tscii': 'ta_IN.TSCII-0',
`
1669
1716
`'ta_in.tscii0': 'ta_IN.TSCII-0',
`
1670
1717
`'ta_lk': 'ta_LK.UTF-8',
`
``
1718
`+
'tcy_in.utf8': 'tcy_IN.UTF-8',
`
1671
1719
`'te': 'te_IN.UTF-8',
`
1672
1720
`'te_in': 'te_IN.UTF-8',
`
1673
1721
`'tg': 'tg_TJ.KOI8-C',
`
`@@ -1679,6 +1727,7 @@ def getpreferredencoding(do_setlocale = True):
`
1679
1727
`'th_th.tactis': 'th_TH.TIS620',
`
1680
1728
`'th_th.tis620': 'th_TH.TIS620',
`
1681
1729
`'thai': 'th_TH.ISO8859-11',
`
``
1730
`+
'the_np': 'the_NP.UTF-8',
`
1682
1731
`'ti_er': 'ti_ER.UTF-8',
`
1683
1732
`'ti_et': 'ti_ET.UTF-8',
`
1684
1733
`'tig_er': 'tig_ER.UTF-8',
`
`@@ -1689,6 +1738,8 @@ def getpreferredencoding(do_setlocale = True):
`
1689
1738
`'tn': 'tn_ZA.ISO8859-15',
`
1690
1739
`'tn_za': 'tn_ZA.ISO8859-15',
`
1691
1740
`'tn_za.iso885915': 'tn_ZA.ISO8859-15',
`
``
1741
`+
'to_to': 'to_TO.UTF-8',
`
``
1742
`+
'tpi_pg': 'tpi_PG.UTF-8',
`
1692
1743
`'tr': 'tr_TR.ISO8859-9',
`
1693
1744
`'tr_cy': 'tr_CY.ISO8859-9',
`
1694
1745
`'tr_tr': 'tr_TR.ISO8859-9',
`
`@@ -1750,6 +1801,7 @@ def getpreferredencoding(do_setlocale = True):
`
1750
1801
`'yi_us.microsoftcp1255': 'yi_US.CP1255',
`
1751
1802
`'yo_ng': 'yo_NG.UTF-8',
`
1752
1803
`'yue_hk': 'yue_HK.UTF-8',
`
``
1804
`+
'yuw_pg': 'yuw_PG.UTF-8',
`
1753
1805
`'zh': 'zh_CN.eucCN',
`
1754
1806
`'zh_cn': 'zh_CN.gb2312',
`
1755
1807
`'zh_cn.big5': 'zh_TW.big5',
`