[Python-checkins] cpython (2.7): Issue #20034: Updated alias mapping to most recent locale.alias file
serhiy.storchaka
python-checkins at python.org
Fri Dec 20 17:24:29 CET 2013
http://hg.python.org/cpython/rev/81f8375e60ce
changeset: 88084:81f8375e60ce
branch: 2.7
parent: 88077:3bec2d0fb668
user: Serhiy Storchaka <storchaka at gmail.com>
date: Fri Dec 20 18:22:38 2013 +0200
summary:
Issue #20034: Updated alias mapping to most recent locale.alias file
from X.org distribution using makelocalealias.py.
files:
Lib/locale.py | 54 +++++++++++++++++++++++++++++++-------
Misc/NEWS | 3 ++
2 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/Lib/locale.py b/Lib/locale.py
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -766,11 +766,30 @@
# 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'
#
+# SS 2013-12-20:
+# 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.7.6
+# and older):
+#
+# updated 'a3' -> 'a3_AZ.KOI8-C' to 'az_AZ.KOI8-C'
+# updated 'a3_az' -> 'a3_AZ.KOI8-C' to 'az_AZ.KOI8-C'
+# updated 'a3_az.koi8c' -> 'a3_AZ.KOI8-C' to 'az_AZ.KOI8-C'
+# updated 'cs_cs.iso88592' -> 'cs_CS.ISO8859-2' to 'cs_CZ.ISO8859-2'
+# updated 'hebrew' -> 'iw_IL.ISO8859-8' to 'he_IL.ISO8859-8'
+# updated 'hebrew.iso88598' -> 'iw_IL.ISO8859-8' to 'he_IL.ISO8859-8'
+# updated 'sd' -> 'sd_IN at devanagari.UTF-8' to 'sd_IN.UTF-8'
+# updated 'sr at latn' -> 'sr_RS.UTF-8 at latin' to 'sr_CS.UTF-8 at latin'
+# updated 'sr_cs' -> 'sr_RS.UTF-8' to 'sr_CS.UTF-8'
+# updated 'sr_cs.utf8 at latn' -> 'sr_RS.UTF-8 at latin' to 'sr_CS.UTF-8 at latin'
+# updated 'sr_cs at latn' -> 'sr_RS.UTF-8 at latin' to 'sr_CS.UTF-8 at latin'
locale_alias = {
- 'a3': 'a3_AZ.KOI8-C',
- 'a3_az': 'a3_AZ.KOI8-C',
- 'a3_az.koi8c': 'a3_AZ.KOI8-C',
+ 'a3': 'az_AZ.KOI8-C',
+ 'a3_az': 'az_AZ.KOI8-C',
+ 'a3_az.koi8c': 'az_AZ.KOI8-C',
+ 'a3_az.koic': 'az_AZ.KOI8-C',
'af': 'af_ZA.ISO8859-1',
'af_za': 'af_ZA.ISO8859-1',
'af_za.iso88591': 'af_ZA.ISO8859-1',
@@ -789,6 +808,7 @@
'ar_dz.iso88596': 'ar_DZ.ISO8859-6',
'ar_eg': 'ar_EG.ISO8859-6',
'ar_eg.iso88596': 'ar_EG.ISO8859-6',
+ 'ar_in': 'ar_IN.UTF-8',
'ar_iq': 'ar_IQ.ISO8859-6',
'ar_iq.iso88596': 'ar_IQ.ISO8859-6',
'ar_jo': 'ar_JO.ISO8859-6',
@@ -818,6 +838,7 @@
'arabic': 'ar_AA.ISO8859-6',
'arabic.iso88596': 'ar_AA.ISO8859-6',
'as': 'as_IN.UTF-8',
+ 'as_in': 'as_IN.UTF-8',
'az': 'az_AZ.ISO8859-9E',
'az_az': 'az_AZ.ISO8859-9E',
'az_az.iso88599e': 'az_AZ.ISO8859-9E',
@@ -835,6 +856,7 @@
'bg_bg.koi8r': 'bg_BG.KOI8-R',
'bg_bg.microsoftcp1251': 'bg_BG.CP1251',
'bn_in': 'bn_IN.UTF-8',
+ 'bo_in': 'bo_IN.UTF-8',
'bokmal': 'nb_NO.ISO8859-1',
'bokm\xe5l': 'nb_NO.ISO8859-1',
'br': 'br_FR.ISO8859-1',
@@ -852,6 +874,7 @@
'c': 'C',
'c-french': 'fr_CA.ISO8859-1',
'c-french.iso88591': 'fr_CA.ISO8859-1',
+ 'c.ascii': 'C',
'c.en': 'C',
'c.iso88591': 'en_US.ISO8859-1',
'c_c': 'C',
@@ -889,7 +912,7 @@
'croatian': 'hr_HR.ISO8859-2',
'cs': 'cs_CZ.ISO8859-2',
'cs_cs': 'cs_CZ.ISO8859-2',
- 'cs_cs.iso88592': 'cs_CS.ISO8859-2',
+ 'cs_cs.iso88592': 'cs_CZ.ISO8859-2',
'cs_cz': 'cs_CZ.ISO8859-2',
'cs_cz.iso88592': 'cs_CZ.ISO8859-2',
'cy': 'cy_GB.ISO8859-1',
@@ -1193,12 +1216,13 @@
'he_il.cp1255': 'he_IL.CP1255',
'he_il.iso88598': 'he_IL.ISO8859-8',
'he_il.microsoftcp1255': 'he_IL.CP1255',
- 'hebrew': 'iw_IL.ISO8859-8',
- 'hebrew.iso88598': 'iw_IL.ISO8859-8',
+ 'hebrew': 'he_IL.ISO8859-8',
+ 'hebrew.iso88598': 'he_IL.ISO8859-8',
'hi': 'hi_IN.ISCII-DEV',
'hi_in': 'hi_IN.ISCII-DEV',
'hi_in.isciidev': 'hi_IN.ISCII-DEV',
'hne': 'hne_IN.UTF-8',
+ 'hne_in': 'hne_IN.UTF-8',
'hr': 'hr_HR.ISO8859-2',
'hr_hr': 'hr_HR.ISO8859-2',
'hr_hr.iso88592': 'hr_HR.ISO8859-2',
@@ -1286,6 +1310,7 @@
'korean': 'ko_KR.eucKR',
'korean.euc': 'ko_KR.eucKR',
'ks': 'ks_IN.UTF-8',
+ 'ks_in': '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',
@@ -1310,6 +1335,7 @@
'lv_lv.iso885913': 'lv_LV.ISO8859-13',
'lv_lv.iso88594': 'lv_LV.ISO8859-4',
'mai': 'mai_IN.UTF-8',
+ 'mai_in': 'mai_IN.UTF-8',
'mi': 'mi_NZ.ISO8859-1',
'mi_nz': 'mi_NZ.ISO8859-1',
'mi_nz.iso88591': 'mi_NZ.ISO8859-1',
@@ -1319,6 +1345,7 @@
'mk_mk.iso88595': 'mk_MK.ISO8859-5',
'mk_mk.microsoftcp1251': 'mk_MK.CP1251',
'ml': 'ml_IN.UTF-8',
+ 'ml_in': 'ml_IN.UTF-8',
'mr': 'mr_IN.UTF-8',
'mr_in': 'mr_IN.UTF-8',
'ms': 'ms_MY.ISO8859-1',
@@ -1333,6 +1360,7 @@
'nb_no.iso88591': 'nb_NO.ISO8859-1',
'nb_no.iso885915': 'nb_NO.ISO8859-15',
'nb_no at euro': 'nb_NO.ISO8859-15',
+ 'ne_np': 'ne_NP.UTF-8',
'nl': 'nl_NL.ISO8859-1',
'nl.iso885915': 'nl_NL.ISO8859-15',
'nl_be': 'nl_BE.ISO8859-1',
@@ -1385,6 +1413,7 @@
'oc_fr.iso885915': 'oc_FR.ISO8859-15',
'oc_fr at euro': 'oc_FR.ISO8859-15',
'or': 'or_IN.UTF-8',
+ 'or_in': 'or_IN.UTF-8',
'pa': 'pa_IN.UTF-8',
'pa_in': 'pa_IN.UTF-8',
'pd': 'pd_US.ISO8859-1',
@@ -1446,7 +1475,9 @@
'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',
+ 'sd': 'sd_IN.UTF-8',
+ 'sd at devanagari': 'sd_IN at devanagari.UTF-8',
+ 'sd_in at devanagari': 'sd_IN at devanagari.UTF-8',
'se_no': 'se_NO.UTF-8',
'serbocroatian': 'sr_RS.UTF-8 at latin',
'sh': 'sr_RS.UTF-8 at latin',
@@ -1480,13 +1511,13 @@
'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 at latn': 'sr_CS.UTF-8 at latin',
+ 'sr_cs': 'sr_CS.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_RS.UTF-8 at latin',
- 'sr_cs at latn': 'sr_RS.UTF-8 at latin',
+ 'sr_cs.utf8 at latn': 'sr_CS.UTF-8 at latin',
+ 'sr_cs at latn': 'sr_CS.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',
@@ -1564,6 +1595,7 @@
'universal': 'en_US.utf',
'universal.utf8 at ucs4': 'en_US.UTF-8',
'ur': 'ur_PK.CP1256',
+ 'ur_in': 'ur_IN.UTF-8',
'ur_pk': 'ur_PK.CP1256',
'ur_pk.cp1256': 'ur_PK.CP1256',
'ur_pk.microsoftcp1256': 'ur_PK.CP1256',
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@
Library
-------
+- Issue #20034: Updated alias mapping to most recent locale.alias file
+ from X.org distribution using makelocalealias.py.
+
- Issue #5815: Fixed support for locales with modifiers. Fixed support for
locale encodings with hyphens.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list