[Python-checkins] r79978 - in python/branches/py3k: Lib/locale.py Misc/NEWS Tools/i18n/makelocalealias.py
antoine.pitrou
python-checkins at python.org
Mon Apr 12 00:35:34 CEST 2010
Author: antoine.pitrou
Date: Mon Apr 12 00:35:34 2010
New Revision: 79978
Log:
Merged revisions 79977 via svnmerge from
svn+ssh://pythondev@svn.python.org/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.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/locale.py
python/branches/py3k/Misc/NEWS
python/branches/py3k/Tools/i18n/makelocalealias.py
Modified: python/branches/py3k/Lib/locale.py
==============================================================================
--- python/branches/py3k/Lib/locale.py (original)
+++ python/branches/py3k/Lib/locale.py Mon Apr 12 00:35:34 2010
@@ -710,6 +710,28 @@
# updated 'sr_yu.microsoftcp1251 at cyrillic' -> 'sr_YU.CP1251' to 'sr_CS.CP1251'
# updated 'sr_yu.utf8 at cyrillic' -> 'sr_YU.UTF-8' to 'sr_CS.UTF-8'
# updated 'sr_yu at cyrillic' -> 'sr_YU.ISO8859-5' to 'sr_CS.ISO8859-5'
+#
+# AP 2010-04-12:
+# Updated alias mapping to most recent locale.alias file
+# from X.org distribution using makelocalealias.py.
+#
+# These are the differences compared to the old mapping (Python 2.6.5
+# and older):
+#
+# updated 'ru' -> 'ru_RU.ISO8859-5' to 'ru_RU.UTF-8'
+# updated 'ru_ru' -> 'ru_RU.ISO8859-5' to 'ru_RU.UTF-8'
+# updated 'serbocroatian' -> 'sr_CS.ISO8859-2' to 'sr_RS.UTF-8 at latin'
+# updated 'sh' -> 'sr_CS.ISO8859-2' to 'sr_RS.UTF-8 at latin'
+# updated 'sh_yu' -> 'sr_CS.ISO8859-2' to 'sr_RS.UTF-8 at latin'
+# updated 'sr' -> 'sr_CS.ISO8859-5' to 'sr_RS.UTF-8'
+# updated 'sr at cyrillic' -> 'sr_CS.ISO8859-5' to 'sr_RS.UTF-8'
+# updated 'sr at latn' -> 'sr_CS.ISO8859-2' to 'sr_RS.UTF-8 at latin'
+# updated 'sr_cs.utf8 at latn' -> 'sr_CS.UTF-8' to 'sr_RS.UTF-8 at latin'
+# updated 'sr_cs at latn' -> 'sr_CS.ISO8859-2' to 'sr_RS.UTF-8 at latin'
+# updated 'sr_yu' -> 'sr_CS.ISO8859-5' to 'sr_RS.UTF-8 at latin'
+# updated 'sr_yu.utf8 at cyrillic' -> 'sr_CS.UTF-8' to 'sr_RS.UTF-8'
+# updated 'sr_yu at cyrillic' -> 'sr_CS.ISO8859-5' to 'sr_RS.UTF-8'
+#
locale_alias = {
'a3': 'a3_AZ.KOI8-C',
@@ -761,13 +783,17 @@
'ar_ye.iso88596': 'ar_YE.ISO8859-6',
'arabic': 'ar_AA.ISO8859-6',
'arabic.iso88596': 'ar_AA.ISO8859-6',
+ 'as': 'as_IN.UTF-8',
'az': 'az_AZ.ISO8859-9E',
'az_az': 'az_AZ.ISO8859-9E',
'az_az.iso88599e': 'az_AZ.ISO8859-9E',
'be': 'be_BY.CP1251',
+ 'be at latin': 'be_BY.UTF-8 at latin',
'be_by': 'be_BY.CP1251',
'be_by.cp1251': 'be_BY.CP1251',
'be_by.microsoftcp1251': 'be_BY.CP1251',
+ 'be_by.utf8 at latin': 'be_BY.UTF-8 at latin',
+ 'be_by at latin': 'be_BY.UTF-8 at latin',
'bg': 'bg_BG.CP1251',
'bg_bg': 'bg_BG.CP1251',
'bg_bg.cp1251': 'bg_BG.CP1251',
@@ -797,12 +823,30 @@
'c_c': 'C',
'c_c.c': 'C',
'ca': 'ca_ES.ISO8859-1',
+ 'ca_ad': 'ca_AD.ISO8859-1',
+ 'ca_ad.iso88591': 'ca_AD.ISO8859-1',
+ 'ca_ad.iso885915': 'ca_AD.ISO8859-15',
+ 'ca_ad.iso885915 at euro': 'ca_AD.ISO8859-15',
+ 'ca_ad.utf8 at euro': 'ca_AD.UTF-8',
+ 'ca_ad at euro': 'ca_AD.ISO8859-15',
'ca_es': 'ca_ES.ISO8859-1',
'ca_es.iso88591': 'ca_ES.ISO8859-1',
'ca_es.iso885915': 'ca_ES.ISO8859-15',
'ca_es.iso885915 at euro': 'ca_ES.ISO8859-15',
'ca_es.utf8 at euro': 'ca_ES.UTF-8',
'ca_es at euro': 'ca_ES.ISO8859-15',
+ 'ca_fr': 'ca_FR.ISO8859-1',
+ 'ca_fr.iso88591': 'ca_FR.ISO8859-1',
+ 'ca_fr.iso885915': 'ca_FR.ISO8859-15',
+ 'ca_fr.iso885915 at euro': 'ca_FR.ISO8859-15',
+ 'ca_fr.utf8 at euro': 'ca_FR.UTF-8',
+ 'ca_fr at euro': 'ca_FR.ISO8859-15',
+ 'ca_it': 'ca_IT.ISO8859-1',
+ 'ca_it.iso88591': 'ca_IT.ISO8859-1',
+ 'ca_it.iso885915': 'ca_IT.ISO8859-15',
+ 'ca_it.iso885915 at euro': 'ca_IT.ISO8859-15',
+ 'ca_it.utf8 at euro': 'ca_IT.UTF-8',
+ 'ca_it at euro': 'ca_IT.ISO8859-15',
'catalan': 'ca_ES.ISO8859-1',
'cextend': 'en_US.ISO8859-1',
'cextend.en': 'en_US.ISO8859-1',
@@ -824,6 +868,7 @@
'cz_cz': 'cs_CZ.ISO8859-2',
'czech': 'cs_CZ.ISO8859-2',
'da': 'da_DK.ISO8859-1',
+ 'da.iso885915': 'da_DK.ISO8859-15',
'da_dk': 'da_DK.ISO8859-1',
'da_dk.88591': 'da_DK.ISO8859-1',
'da_dk.885915': 'da_DK.ISO8859-15',
@@ -834,6 +879,7 @@
'danish.iso88591': 'da_DK.ISO8859-1',
'dansk': 'da_DK.ISO8859-1',
'de': 'de_DE.ISO8859-1',
+ 'de.iso885915': 'de_DE.ISO8859-15',
'de_at': 'de_AT.ISO8859-1',
'de_at.iso88591': 'de_AT.ISO8859-1',
'de_at.iso885915': 'de_AT.ISO8859-15',
@@ -1015,6 +1061,7 @@
'fa_ir': 'fa_IR.UTF-8',
'fa_ir.isiri3342': 'fa_IR.ISIRI-3342',
'fi': 'fi_FI.ISO8859-15',
+ 'fi.iso885915': 'fi_FI.ISO8859-15',
'fi_fi': 'fi_FI.ISO8859-15',
'fi_fi.88591': 'fi_FI.ISO8859-1',
'fi_fi.iso88591': 'fi_FI.ISO8859-1',
@@ -1030,6 +1077,7 @@
'fo_fo.iso885915': 'fo_FO.ISO8859-15',
'fo_fo at euro': 'fo_FO.ISO8859-15',
'fr': 'fr_FR.ISO8859-1',
+ 'fr.iso885915': 'fr_FR.ISO8859-15',
'fr_be': 'fr_BE.ISO8859-1',
'fr_be.88591': 'fr_BE.ISO8859-1',
'fr_be.iso88591': 'fr_BE.ISO8859-1',
@@ -1116,6 +1164,7 @@
'hi': 'hi_IN.ISCII-DEV',
'hi_in': 'hi_IN.ISCII-DEV',
'hi_in.isciidev': 'hi_IN.ISCII-DEV',
+ 'hne': 'hne_IN.UTF-8',
'hr': 'hr_HR.ISO8859-2',
'hr_hr': 'hr_HR.ISO8859-2',
'hr_hr.iso88592': 'hr_HR.ISO8859-2',
@@ -1142,6 +1191,7 @@
'iso_8859_1': 'en_US.ISO8859-1',
'iso_8859_15': 'en_US.ISO8859-15',
'it': 'it_IT.ISO8859-1',
+ 'it.iso885915': 'it_IT.ISO8859-15',
'it_ch': 'it_CH.ISO8859-1',
'it_ch.iso88591': 'it_CH.ISO8859-1',
'it_ch.iso885915': 'it_CH.ISO8859-15',
@@ -1173,6 +1223,7 @@
'ja_jp.jis': 'ja_JP.JIS7',
'ja_jp.jis7': 'ja_JP.JIS7',
'ja_jp.mscode': 'ja_JP.SJIS',
+ 'ja_jp.pck': 'ja_JP.SJIS',
'ja_jp.sjis': 'ja_JP.SJIS',
'ja_jp.ujis': 'ja_JP.eucJP',
'japan': 'ja_JP.eucJP',
@@ -1192,6 +1243,7 @@
'kl_gl.iso885915': 'kl_GL.ISO8859-15',
'kl_gl at euro': 'kl_GL.ISO8859-15',
'km_kh': 'km_KH.UTF-8',
+ 'kn': 'kn_IN.UTF-8',
'kn_in': 'kn_IN.UTF-8',
'ko': 'ko_KR.eucKR',
'ko_kr': 'ko_KR.eucKR',
@@ -1199,6 +1251,8 @@
'ko_kr.euckr': 'ko_KR.eucKR',
'korean': 'ko_KR.eucKR',
'korean.euc': 'ko_KR.eucKR',
+ 'ks': 'ks_IN.UTF-8',
+ 'ks_in at devanagari': 'ks_IN at devanagari.UTF-8',
'kw': 'kw_GB.ISO8859-1',
'kw_gb': 'kw_GB.ISO8859-1',
'kw_gb.iso88591': 'kw_GB.ISO8859-1',
@@ -1221,6 +1275,7 @@
'lv_lv': 'lv_LV.ISO8859-13',
'lv_lv.iso885913': 'lv_LV.ISO8859-13',
'lv_lv.iso88594': 'lv_LV.ISO8859-4',
+ 'mai': 'mai_IN.UTF-8',
'mi': 'mi_NZ.ISO8859-1',
'mi_nz': 'mi_NZ.ISO8859-1',
'mi_nz.iso88591': 'mi_NZ.ISO8859-1',
@@ -1229,6 +1284,8 @@
'mk_mk.cp1251': 'mk_MK.CP1251',
'mk_mk.iso88595': 'mk_MK.ISO8859-5',
'mk_mk.microsoftcp1251': 'mk_MK.CP1251',
+ 'ml': 'ml_IN.UTF-8',
+ 'mr': 'mr_IN.UTF-8',
'mr_in': 'mr_IN.UTF-8',
'ms': 'ms_MY.ISO8859-1',
'ms_my': 'ms_MY.ISO8859-1',
@@ -1243,6 +1300,7 @@
'nb_no.iso885915': 'nb_NO.ISO8859-15',
'nb_no at euro': 'nb_NO.ISO8859-15',
'nl': 'nl_NL.ISO8859-1',
+ 'nl.iso885915': 'nl_NL.ISO8859-15',
'nl_be': 'nl_BE.ISO8859-1',
'nl_be.88591': 'nl_BE.ISO8859-1',
'nl_be.iso88591': 'nl_BE.ISO8859-1',
@@ -1269,6 +1327,8 @@
'no_no.88591': 'no_NO.ISO8859-1',
'no_no.iso88591': 'no_NO.ISO8859-1',
'no_no.iso885915': 'no_NO.ISO8859-15',
+ 'no_no.iso88591 at bokmal': 'no_NO.ISO8859-1',
+ 'no_no.iso88591 at nynorsk': 'no_NO.ISO8859-1',
'no_no at euro': 'no_NO.ISO8859-15',
'norwegian': 'no_NO.ISO8859-1',
'norwegian.iso88591': 'no_NO.ISO8859-1',
@@ -1290,6 +1350,8 @@
'oc_fr.iso88591': 'oc_FR.ISO8859-1',
'oc_fr.iso885915': 'oc_FR.ISO8859-15',
'oc_fr at euro': 'oc_FR.ISO8859-15',
+ 'or': 'or_IN.UTF-8',
+ 'pa': 'pa_IN.UTF-8',
'pa_in': 'pa_IN.UTF-8',
'pd': 'pd_US.ISO8859-1',
'pd_de': 'pd_DE.ISO8859-1',
@@ -1317,6 +1379,7 @@
'pp_an': 'pp_AN.ISO8859-1',
'pp_an.iso88591': 'pp_AN.ISO8859-1',
'pt': 'pt_PT.ISO8859-1',
+ 'pt.iso885915': 'pt_PT.ISO8859-15',
'pt_br': 'pt_BR.ISO8859-1',
'pt_br.88591': 'pt_BR.ISO8859-1',
'pt_br.iso88591': 'pt_BR.ISO8859-1',
@@ -1333,8 +1396,9 @@
'ro_ro': 'ro_RO.ISO8859-2',
'ro_ro.iso88592': 'ro_RO.ISO8859-2',
'romanian': 'ro_RO.ISO8859-2',
- 'ru': 'ru_RU.ISO8859-5',
- 'ru_ru': 'ru_RU.ISO8859-5',
+ 'ru': 'ru_RU.UTF-8',
+ 'ru.koi8r': 'ru_RU.KOI8-R',
+ 'ru_ru': 'ru_RU.UTF-8',
'ru_ru.cp1251': 'ru_RU.CP1251',
'ru_ru.iso88595': 'ru_RU.ISO8859-5',
'ru_ru.koi8r': 'ru_RU.KOI8-R',
@@ -1348,13 +1412,15 @@
'rw': 'rw_RW.ISO8859-1',
'rw_rw': 'rw_RW.ISO8859-1',
'rw_rw.iso88591': 'rw_RW.ISO8859-1',
+ 'sd': 'sd_IN at devanagari.UTF-8',
'se_no': 'se_NO.UTF-8',
- 'serbocroatian': 'sr_CS.ISO8859-2',
- 'sh': 'sr_CS.ISO8859-2',
+ 'serbocroatian': 'sr_RS.UTF-8 at latin',
+ 'sh': 'sr_RS.UTF-8 at latin',
+ 'sh_ba.iso88592 at bosnia': 'sr_CS.ISO8859-2',
'sh_hr': 'sh_HR.ISO8859-2',
'sh_hr.iso88592': 'hr_HR.ISO8859-2',
'sh_sp': 'sr_CS.ISO8859-2',
- 'sh_yu': 'sr_CS.ISO8859-2',
+ 'sh_yu': 'sr_RS.UTF-8 at latin',
'si': 'si_LK.UTF-8',
'si_lk': 'si_LK.UTF-8',
'sinhala': 'si_LK.UTF-8',
@@ -1377,23 +1443,30 @@
'sq': 'sq_AL.ISO8859-2',
'sq_al': 'sq_AL.ISO8859-2',
'sq_al.iso88592': 'sq_AL.ISO8859-2',
- 'sr': 'sr_CS.ISO8859-5',
- 'sr at cyrillic': 'sr_CS.ISO8859-5',
- 'sr at latn': 'sr_CS.ISO8859-2',
+ 'sr': 'sr_RS.UTF-8',
+ 'sr at cyrillic': 'sr_RS.UTF-8',
+ 'sr at latin': 'sr_RS.UTF-8 at latin',
+ 'sr at latn': 'sr_RS.UTF-8 at latin',
+ 'sr_cs': 'sr_RS.UTF-8',
'sr_cs.iso88592': 'sr_CS.ISO8859-2',
'sr_cs.iso88592 at latn': 'sr_CS.ISO8859-2',
'sr_cs.iso88595': 'sr_CS.ISO8859-5',
- 'sr_cs.utf8 at latn': 'sr_CS.UTF-8',
- 'sr_cs at latn': 'sr_CS.ISO8859-2',
+ 'sr_cs.utf8 at latn': 'sr_RS.UTF-8 at latin',
+ 'sr_cs at latn': 'sr_RS.UTF-8 at latin',
+ 'sr_me': 'sr_ME.UTF-8',
+ 'sr_rs': 'sr_RS.UTF-8',
+ 'sr_rs.utf8 at latn': 'sr_RS.UTF-8 at latin',
+ 'sr_rs at latin': 'sr_RS.UTF-8 at latin',
+ 'sr_rs at latn': 'sr_RS.UTF-8 at latin',
'sr_sp': 'sr_CS.ISO8859-2',
- 'sr_yu': 'sr_CS.ISO8859-5',
+ 'sr_yu': 'sr_RS.UTF-8 at latin',
'sr_yu.cp1251 at cyrillic': 'sr_CS.CP1251',
'sr_yu.iso88592': 'sr_CS.ISO8859-2',
'sr_yu.iso88595': 'sr_CS.ISO8859-5',
'sr_yu.iso88595 at cyrillic': 'sr_CS.ISO8859-5',
'sr_yu.microsoftcp1251 at cyrillic': 'sr_CS.CP1251',
- 'sr_yu.utf8 at cyrillic': 'sr_CS.UTF-8',
- 'sr_yu at cyrillic': 'sr_CS.ISO8859-5',
+ 'sr_yu.utf8 at cyrillic': 'sr_RS.UTF-8',
+ 'sr_yu at cyrillic': 'sr_RS.UTF-8',
'ss': 'ss_ZA.ISO8859-1',
'ss_za': 'ss_ZA.ISO8859-1',
'ss_za.iso88591': 'ss_ZA.ISO8859-1',
@@ -1401,6 +1474,7 @@
'st_za': 'st_ZA.ISO8859-1',
'st_za.iso88591': 'st_ZA.ISO8859-1',
'sv': 'sv_SE.ISO8859-1',
+ 'sv.iso885915': 'sv_SE.ISO8859-15',
'sv_fi': 'sv_FI.ISO8859-1',
'sv_fi.iso88591': 'sv_FI.ISO8859-1',
'sv_fi.iso885915': 'sv_FI.ISO8859-15',
@@ -1418,6 +1492,7 @@
'ta_in': 'ta_IN.TSCII-0',
'ta_in.tscii': 'ta_IN.TSCII-0',
'ta_in.tscii0': 'ta_IN.TSCII-0',
+ 'te': 'te_IN.UTF-8',
'tg': 'tg_TJ.KOI8-C',
'tg_tj': 'tg_TJ.KOI8-C',
'tg_tj.koi8c': 'tg_TJ.KOI8-C',
@@ -1493,6 +1568,7 @@
'zh_cn.gbk': 'zh_CN.gbk',
'zh_hk': 'zh_HK.big5hkscs',
'zh_hk.big5': 'zh_HK.big5',
+ 'zh_hk.big5hk': 'zh_HK.big5hkscs',
'zh_hk.big5hkscs': 'zh_HK.big5hkscs',
'zh_tw': 'zh_TW.big5',
'zh_tw.big5': 'zh_TW.big5',
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Mon Apr 12 00:35:34 2010
@@ -312,6 +312,9 @@
Library
-------
+- Issue #8374: Update the internal alias table in the :mod:`locale` module
+ to cover recent locale changes and additions.
+
- Issue #8321: Give access to OpenSSL version numbers from the `ssl` module,
using the new attributes `ssl.OPENSSL_VERSION`, `ssl.OPENSSL_VERSION_INFO`
and `ssl.OPENSSL_VERSION_NUMBER`.
Modified: python/branches/py3k/Tools/i18n/makelocalealias.py
==============================================================================
--- python/branches/py3k/Tools/i18n/makelocalealias.py (original)
+++ python/branches/py3k/Tools/i18n/makelocalealias.py Mon Apr 12 00:35:34 2010
@@ -9,7 +9,7 @@
import locale
# Location of the alias file
-LOCALE_ALIAS = '/usr/lib/X11/locale/locale.alias'
+LOCALE_ALIAS = '/usr/share/X11/locale/locale.alias'
def parse(filename):
More information about the Python-checkins
mailing list