Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 0c70d2d

Browse files
pitroupitrou
committed
Merged revisions 79977 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r79977 | antoine.pitrou | 2010-04-12 00:32:39 +0200 (lun., 12 avril 2010) | 4 lines Issue #8374: Update the internal alias table in the :mod:`locale` module to cover recent locale changes and additions. ........
1 parent 99f0376 commit 0c70d2d

3 files changed

Lines changed: 93 additions & 14 deletions

File tree

‎Lib/locale.py‎

Lines changed: 89 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,28 @@ def getpreferredencoding(do_setlocale = True):
710710
# updated 'sr_yu.microsoftcp1251@cyrillic' -> 'sr_YU.CP1251' to 'sr_CS.CP1251'
711711
# updated 'sr_yu.utf8@cyrillic' -> 'sr_YU.UTF-8' to 'sr_CS.UTF-8'
712712
# updated 'sr_yu@cyrillic' -> 'sr_YU.ISO8859-5' to 'sr_CS.ISO8859-5'
713+
#
714+
# AP 2010-04-12:
715+
# Updated alias mapping to most recent locale.alias file
716+
# from X.org distribution using makelocalealias.py.
717+
#
718+
# These are the differences compared to the old mapping (Python 2.6.5
719+
# and older):
720+
#
721+
# updated 'ru' -> 'ru_RU.ISO8859-5' to 'ru_RU.UTF-8'
722+
# updated 'ru_ru' -> 'ru_RU.ISO8859-5' to 'ru_RU.UTF-8'
723+
# updated 'serbocroatian' -> 'sr_CS.ISO8859-2' to 'sr_RS.UTF-8@latin'
724+
# updated 'sh' -> 'sr_CS.ISO8859-2' to 'sr_RS.UTF-8@latin'
725+
# updated 'sh_yu' -> 'sr_CS.ISO8859-2' to 'sr_RS.UTF-8@latin'
726+
# updated 'sr' -> 'sr_CS.ISO8859-5' to 'sr_RS.UTF-8'
727+
# updated 'sr@cyrillic' -> 'sr_CS.ISO8859-5' to 'sr_RS.UTF-8'
728+
# updated 'sr@latn' -> 'sr_CS.ISO8859-2' to 'sr_RS.UTF-8@latin'
729+
# updated 'sr_cs.utf8@latn' -> 'sr_CS.UTF-8' to 'sr_RS.UTF-8@latin'
730+
# updated 'sr_cs@latn' -> 'sr_CS.ISO8859-2' to 'sr_RS.UTF-8@latin'
731+
# updated 'sr_yu' -> 'sr_CS.ISO8859-5' to 'sr_RS.UTF-8@latin'
732+
# updated 'sr_yu.utf8@cyrillic' -> 'sr_CS.UTF-8' to 'sr_RS.UTF-8'
733+
# updated 'sr_yu@cyrillic' -> 'sr_CS.ISO8859-5' to 'sr_RS.UTF-8'
734+
#
713735

714736
locale_alias = {
715737
'a3': 'a3_AZ.KOI8-C',
@@ -761,13 +783,17 @@ def getpreferredencoding(do_setlocale = True):
761783
'ar_ye.iso88596': 'ar_YE.ISO8859-6',
762784
'arabic': 'ar_AA.ISO8859-6',
763785
'arabic.iso88596': 'ar_AA.ISO8859-6',
786+
'as': 'as_IN.UTF-8',
764787
'az': 'az_AZ.ISO8859-9E',
765788
'az_az': 'az_AZ.ISO8859-9E',
766789
'az_az.iso88599e': 'az_AZ.ISO8859-9E',
767790
'be': 'be_BY.CP1251',
791+
'be@latin': 'be_BY.UTF-8@latin',
768792
'be_by': 'be_BY.CP1251',
769793
'be_by.cp1251': 'be_BY.CP1251',
770794
'be_by.microsoftcp1251': 'be_BY.CP1251',
795+
'be_by.utf8@latin': 'be_BY.UTF-8@latin',
796+
'be_by@latin': 'be_BY.UTF-8@latin',
771797
'bg': 'bg_BG.CP1251',
772798
'bg_bg': 'bg_BG.CP1251',
773799
'bg_bg.cp1251': 'bg_BG.CP1251',
@@ -797,12 +823,30 @@ def getpreferredencoding(do_setlocale = True):
797823
'c_c': 'C',
798824
'c_c.c': 'C',
799825
'ca': 'ca_ES.ISO8859-1',
826+
'ca_ad': 'ca_AD.ISO8859-1',
827+
'ca_ad.iso88591': 'ca_AD.ISO8859-1',
828+
'ca_ad.iso885915': 'ca_AD.ISO8859-15',
829+
'ca_ad.iso885915@euro': 'ca_AD.ISO8859-15',
830+
'ca_ad.utf8@euro': 'ca_AD.UTF-8',
831+
'ca_ad@euro': 'ca_AD.ISO8859-15',
800832
'ca_es': 'ca_ES.ISO8859-1',
801833
'ca_es.iso88591': 'ca_ES.ISO8859-1',
802834
'ca_es.iso885915': 'ca_ES.ISO8859-15',
803835
'ca_es.iso885915@euro': 'ca_ES.ISO8859-15',
804836
'ca_es.utf8@euro': 'ca_ES.UTF-8',
805837
'ca_es@euro': 'ca_ES.ISO8859-15',
838+
'ca_fr': 'ca_FR.ISO8859-1',
839+
'ca_fr.iso88591': 'ca_FR.ISO8859-1',
840+
'ca_fr.iso885915': 'ca_FR.ISO8859-15',
841+
'ca_fr.iso885915@euro': 'ca_FR.ISO8859-15',
842+
'ca_fr.utf8@euro': 'ca_FR.UTF-8',
843+
'ca_fr@euro': 'ca_FR.ISO8859-15',
844+
'ca_it': 'ca_IT.ISO8859-1',
845+
'ca_it.iso88591': 'ca_IT.ISO8859-1',
846+
'ca_it.iso885915': 'ca_IT.ISO8859-15',
847+
'ca_it.iso885915@euro': 'ca_IT.ISO8859-15',
848+
'ca_it.utf8@euro': 'ca_IT.UTF-8',
849+
'ca_it@euro': 'ca_IT.ISO8859-15',
806850
'catalan': 'ca_ES.ISO8859-1',
807851
'cextend': 'en_US.ISO8859-1',
808852
'cextend.en': 'en_US.ISO8859-1',
@@ -824,6 +868,7 @@ def getpreferredencoding(do_setlocale = True):
824868
'cz_cz': 'cs_CZ.ISO8859-2',
825869
'czech': 'cs_CZ.ISO8859-2',
826870
'da': 'da_DK.ISO8859-1',
871+
'da.iso885915': 'da_DK.ISO8859-15',
827872
'da_dk': 'da_DK.ISO8859-1',
828873
'da_dk.88591': 'da_DK.ISO8859-1',
829874
'da_dk.885915': 'da_DK.ISO8859-15',
@@ -834,6 +879,7 @@ def getpreferredencoding(do_setlocale = True):
834879
'danish.iso88591': 'da_DK.ISO8859-1',
835880
'dansk': 'da_DK.ISO8859-1',
836881
'de': 'de_DE.ISO8859-1',
882+
'de.iso885915': 'de_DE.ISO8859-15',
837883
'de_at': 'de_AT.ISO8859-1',
838884
'de_at.iso88591': 'de_AT.ISO8859-1',
839885
'de_at.iso885915': 'de_AT.ISO8859-15',
@@ -1015,6 +1061,7 @@ def getpreferredencoding(do_setlocale = True):
10151061
'fa_ir': 'fa_IR.UTF-8',
10161062
'fa_ir.isiri3342': 'fa_IR.ISIRI-3342',
10171063
'fi': 'fi_FI.ISO8859-15',
1064+
'fi.iso885915': 'fi_FI.ISO8859-15',
10181065
'fi_fi': 'fi_FI.ISO8859-15',
10191066
'fi_fi.88591': 'fi_FI.ISO8859-1',
10201067
'fi_fi.iso88591': 'fi_FI.ISO8859-1',
@@ -1030,6 +1077,7 @@ def getpreferredencoding(do_setlocale = True):
10301077
'fo_fo.iso885915': 'fo_FO.ISO8859-15',
10311078
'fo_fo@euro': 'fo_FO.ISO8859-15',
10321079
'fr': 'fr_FR.ISO8859-1',
1080+
'fr.iso885915': 'fr_FR.ISO8859-15',
10331081
'fr_be': 'fr_BE.ISO8859-1',
10341082
'fr_be.88591': 'fr_BE.ISO8859-1',
10351083
'fr_be.iso88591': 'fr_BE.ISO8859-1',
@@ -1116,6 +1164,7 @@ def getpreferredencoding(do_setlocale = True):
11161164
'hi': 'hi_IN.ISCII-DEV',
11171165
'hi_in': 'hi_IN.ISCII-DEV',
11181166
'hi_in.isciidev': 'hi_IN.ISCII-DEV',
1167+
'hne': 'hne_IN.UTF-8',
11191168
'hr': 'hr_HR.ISO8859-2',
11201169
'hr_hr': 'hr_HR.ISO8859-2',
11211170
'hr_hr.iso88592': 'hr_HR.ISO8859-2',
@@ -1142,6 +1191,7 @@ def getpreferredencoding(do_setlocale = True):
11421191
'iso_8859_1': 'en_US.ISO8859-1',
11431192
'iso_8859_15': 'en_US.ISO8859-15',
11441193
'it': 'it_IT.ISO8859-1',
1194+
'it.iso885915': 'it_IT.ISO8859-15',
11451195
'it_ch': 'it_CH.ISO8859-1',
11461196
'it_ch.iso88591': 'it_CH.ISO8859-1',
11471197
'it_ch.iso885915': 'it_CH.ISO8859-15',
@@ -1173,6 +1223,7 @@ def getpreferredencoding(do_setlocale = True):
11731223
'ja_jp.jis': 'ja_JP.JIS7',
11741224
'ja_jp.jis7': 'ja_JP.JIS7',
11751225
'ja_jp.mscode': 'ja_JP.SJIS',
1226+
'ja_jp.pck': 'ja_JP.SJIS',
11761227
'ja_jp.sjis': 'ja_JP.SJIS',
11771228
'ja_jp.ujis': 'ja_JP.eucJP',
11781229
'japan': 'ja_JP.eucJP',
@@ -1192,13 +1243,16 @@ def getpreferredencoding(do_setlocale = True):
11921243
'kl_gl.iso885915': 'kl_GL.ISO8859-15',
11931244
'kl_gl@euro': 'kl_GL.ISO8859-15',
11941245
'km_kh': 'km_KH.UTF-8',
1246+
'kn': 'kn_IN.UTF-8',
11951247
'kn_in': 'kn_IN.UTF-8',
11961248
'ko': 'ko_KR.eucKR',
11971249
'ko_kr': 'ko_KR.eucKR',
11981250
'ko_kr.euc': 'ko_KR.eucKR',
11991251
'ko_kr.euckr': 'ko_KR.eucKR',
12001252
'korean': 'ko_KR.eucKR',
12011253
'korean.euc': 'ko_KR.eucKR',
1254+
'ks': 'ks_IN.UTF-8',
1255+
'ks_in@devanagari': '[email protected]',
12021256
'kw': 'kw_GB.ISO8859-1',
12031257
'kw_gb': 'kw_GB.ISO8859-1',
12041258
'kw_gb.iso88591': 'kw_GB.ISO8859-1',
@@ -1221,6 +1275,7 @@ def getpreferredencoding(do_setlocale = True):
12211275
'lv_lv': 'lv_LV.ISO8859-13',
12221276
'lv_lv.iso885913': 'lv_LV.ISO8859-13',
12231277
'lv_lv.iso88594': 'lv_LV.ISO8859-4',
1278+
'mai': 'mai_IN.UTF-8',
12241279
'mi': 'mi_NZ.ISO8859-1',
12251280
'mi_nz': 'mi_NZ.ISO8859-1',
12261281
'mi_nz.iso88591': 'mi_NZ.ISO8859-1',
@@ -1229,6 +1284,8 @@ def getpreferredencoding(do_setlocale = True):
12291284
'mk_mk.cp1251': 'mk_MK.CP1251',
12301285
'mk_mk.iso88595': 'mk_MK.ISO8859-5',
12311286
'mk_mk.microsoftcp1251': 'mk_MK.CP1251',
1287+
'ml': 'ml_IN.UTF-8',
1288+
'mr': 'mr_IN.UTF-8',
12321289
'mr_in': 'mr_IN.UTF-8',
12331290
'ms': 'ms_MY.ISO8859-1',
12341291
'ms_my': 'ms_MY.ISO8859-1',
@@ -1243,6 +1300,7 @@ def getpreferredencoding(do_setlocale = True):
12431300
'nb_no.iso885915': 'nb_NO.ISO8859-15',
12441301
'nb_no@euro': 'nb_NO.ISO8859-15',
12451302
'nl': 'nl_NL.ISO8859-1',
1303+
'nl.iso885915': 'nl_NL.ISO8859-15',
12461304
'nl_be': 'nl_BE.ISO8859-1',
12471305
'nl_be.88591': 'nl_BE.ISO8859-1',
12481306
'nl_be.iso88591': 'nl_BE.ISO8859-1',
@@ -1269,6 +1327,8 @@ def getpreferredencoding(do_setlocale = True):
12691327
'no_no.88591': 'no_NO.ISO8859-1',
12701328
'no_no.iso88591': 'no_NO.ISO8859-1',
12711329
'no_no.iso885915': 'no_NO.ISO8859-15',
1330+
'no_no.iso88591@bokmal': 'no_NO.ISO8859-1',
1331+
'no_no.iso88591@nynorsk': 'no_NO.ISO8859-1',
12721332
'no_no@euro': 'no_NO.ISO8859-15',
12731333
'norwegian': 'no_NO.ISO8859-1',
12741334
'norwegian.iso88591': 'no_NO.ISO8859-1',
@@ -1290,6 +1350,8 @@ def getpreferredencoding(do_setlocale = True):
12901350
'oc_fr.iso88591': 'oc_FR.ISO8859-1',
12911351
'oc_fr.iso885915': 'oc_FR.ISO8859-15',
12921352
'oc_fr@euro': 'oc_FR.ISO8859-15',
1353+
'or': 'or_IN.UTF-8',
1354+
'pa': 'pa_IN.UTF-8',
12931355
'pa_in': 'pa_IN.UTF-8',
12941356
'pd': 'pd_US.ISO8859-1',
12951357
'pd_de': 'pd_DE.ISO8859-1',
@@ -1317,6 +1379,7 @@ def getpreferredencoding(do_setlocale = True):
13171379
'pp_an': 'pp_AN.ISO8859-1',
13181380
'pp_an.iso88591': 'pp_AN.ISO8859-1',
13191381
'pt': 'pt_PT.ISO8859-1',
1382+
'pt.iso885915': 'pt_PT.ISO8859-15',
13201383
'pt_br': 'pt_BR.ISO8859-1',
13211384
'pt_br.88591': 'pt_BR.ISO8859-1',
13221385
'pt_br.iso88591': 'pt_BR.ISO8859-1',
@@ -1333,8 +1396,9 @@ def getpreferredencoding(do_setlocale = True):
13331396
'ro_ro': 'ro_RO.ISO8859-2',
13341397
'ro_ro.iso88592': 'ro_RO.ISO8859-2',
13351398
'romanian': 'ro_RO.ISO8859-2',
1336-
'ru': 'ru_RU.ISO8859-5',
1337-
'ru_ru': 'ru_RU.ISO8859-5',
1399+
'ru': 'ru_RU.UTF-8',
1400+
'ru.koi8r': 'ru_RU.KOI8-R',
1401+
'ru_ru': 'ru_RU.UTF-8',
13381402
'ru_ru.cp1251': 'ru_RU.CP1251',
13391403
'ru_ru.iso88595': 'ru_RU.ISO8859-5',
13401404
'ru_ru.koi8r': 'ru_RU.KOI8-R',
@@ -1348,13 +1412,15 @@ def getpreferredencoding(do_setlocale = True):
13481412
'rw': 'rw_RW.ISO8859-1',
13491413
'rw_rw': 'rw_RW.ISO8859-1',
13501414
'rw_rw.iso88591': 'rw_RW.ISO8859-1',
1415+
'sd': '[email protected]',
13511416
'se_no': 'se_NO.UTF-8',
1352-
'serbocroatian': 'sr_CS.ISO8859-2',
1353-
'sh': 'sr_CS.ISO8859-2',
1417+
'serbocroatian': 'sr_RS.UTF-8@latin',
1418+
'sh': 'sr_RS.UTF-8@latin',
1419+
'sh_ba.iso88592@bosnia': 'sr_CS.ISO8859-2',
13541420
'sh_hr': 'sh_HR.ISO8859-2',
13551421
'sh_hr.iso88592': 'hr_HR.ISO8859-2',
13561422
'sh_sp': 'sr_CS.ISO8859-2',
1357-
'sh_yu': 'sr_CS.ISO8859-2',
1423+
'sh_yu': 'sr_RS.UTF-8@latin',
13581424
'si': 'si_LK.UTF-8',
13591425
'si_lk': 'si_LK.UTF-8',
13601426
'sinhala': 'si_LK.UTF-8',
@@ -1377,30 +1443,38 @@ def getpreferredencoding(do_setlocale = True):
13771443
'sq': 'sq_AL.ISO8859-2',
13781444
'sq_al': 'sq_AL.ISO8859-2',
13791445
'sq_al.iso88592': 'sq_AL.ISO8859-2',
1380-
'sr': 'sr_CS.ISO8859-5',
1381-
'sr@cyrillic': 'sr_CS.ISO8859-5',
1382-
'sr@latn': 'sr_CS.ISO8859-2',
1446+
'sr': 'sr_RS.UTF-8',
1447+
'sr@cyrillic': 'sr_RS.UTF-8',
1448+
'sr@latin': 'sr_RS.UTF-8@latin',
1449+
'sr@latn': 'sr_RS.UTF-8@latin',
1450+
'sr_cs': 'sr_RS.UTF-8',
13831451
'sr_cs.iso88592': 'sr_CS.ISO8859-2',
13841452
'sr_cs.iso88592@latn': 'sr_CS.ISO8859-2',
13851453
'sr_cs.iso88595': 'sr_CS.ISO8859-5',
1386-
'sr_cs.utf8@latn': 'sr_CS.UTF-8',
1387-
'sr_cs@latn': 'sr_CS.ISO8859-2',
1454+
'sr_cs.utf8@latn': 'sr_RS.UTF-8@latin',
1455+
'sr_cs@latn': 'sr_RS.UTF-8@latin',
1456+
'sr_me': 'sr_ME.UTF-8',
1457+
'sr_rs': 'sr_RS.UTF-8',
1458+
'sr_rs.utf8@latn': 'sr_RS.UTF-8@latin',
1459+
'sr_rs@latin': 'sr_RS.UTF-8@latin',
1460+
'sr_rs@latn': 'sr_RS.UTF-8@latin',
13881461
'sr_sp': 'sr_CS.ISO8859-2',
1389-
'sr_yu': 'sr_CS.ISO8859-5',
1462+
'sr_yu': 'sr_RS.UTF-8@latin',
13901463
'sr_yu.cp1251@cyrillic': 'sr_CS.CP1251',
13911464
'sr_yu.iso88592': 'sr_CS.ISO8859-2',
13921465
'sr_yu.iso88595': 'sr_CS.ISO8859-5',
13931466
'sr_yu.iso88595@cyrillic': 'sr_CS.ISO8859-5',
13941467
'sr_yu.microsoftcp1251@cyrillic': 'sr_CS.CP1251',
1395-
'sr_yu.utf8@cyrillic': 'sr_CS.UTF-8',
1396-
'sr_yu@cyrillic': 'sr_CS.ISO8859-5',
1468+
'sr_yu.utf8@cyrillic': 'sr_RS.UTF-8',
1469+
'sr_yu@cyrillic': 'sr_RS.UTF-8',
13971470
'ss': 'ss_ZA.ISO8859-1',
13981471
'ss_za': 'ss_ZA.ISO8859-1',
13991472
'ss_za.iso88591': 'ss_ZA.ISO8859-1',
14001473
'st': 'st_ZA.ISO8859-1',
14011474
'st_za': 'st_ZA.ISO8859-1',
14021475
'st_za.iso88591': 'st_ZA.ISO8859-1',
14031476
'sv': 'sv_SE.ISO8859-1',
1477+
'sv.iso885915': 'sv_SE.ISO8859-15',
14041478
'sv_fi': 'sv_FI.ISO8859-1',
14051479
'sv_fi.iso88591': 'sv_FI.ISO8859-1',
14061480
'sv_fi.iso885915': 'sv_FI.ISO8859-15',
@@ -1418,6 +1492,7 @@ def getpreferredencoding(do_setlocale = True):
14181492
'ta_in': 'ta_IN.TSCII-0',
14191493
'ta_in.tscii': 'ta_IN.TSCII-0',
14201494
'ta_in.tscii0': 'ta_IN.TSCII-0',
1495+
'te': 'te_IN.UTF-8',
14211496
'tg': 'tg_TJ.KOI8-C',
14221497
'tg_tj': 'tg_TJ.KOI8-C',
14231498
'tg_tj.koi8c': 'tg_TJ.KOI8-C',
@@ -1493,6 +1568,7 @@ def getpreferredencoding(do_setlocale = True):
14931568
'zh_cn.gbk': 'zh_CN.gbk',
14941569
'zh_hk': 'zh_HK.big5hkscs',
14951570
'zh_hk.big5': 'zh_HK.big5',
1571+
'zh_hk.big5hk': 'zh_HK.big5hkscs',
14961572
'zh_hk.big5hkscs': 'zh_HK.big5hkscs',
14971573
'zh_tw': 'zh_TW.big5',
14981574
'zh_tw.big5': 'zh_TW.big5',

‎Misc/NEWS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,9 @@ C-API
312312
Library
313313
-------
314314

315+
- Issue #8374: Update the internal alias table in the :mod:`locale` module
316+
to cover recent locale changes and additions.
317+
315318
- Issue #8321: Give access to OpenSSL version numbers from the `ssl` module,
316319
using the new attributes `ssl.OPENSSL_VERSION`, `ssl.OPENSSL_VERSION_INFO`
317320
and `ssl.OPENSSL_VERSION_NUMBER`.

‎Tools/i18n/makelocalealias.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import locale
1010

1111
# Location of the alias file
12-
LOCALE_ALIAS = '/usr/lib/X11/locale/locale.alias'
12+
LOCALE_ALIAS = '/usr/share/X11/locale/locale.alias'
1313

1414
def parse(filename):
1515

0 commit comments

Comments
 (0)