diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2013-12-26 19:21:52 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-12-26 19:21:52 (GMT) |
| commit | e190fac5f957c6da69fa7401a290291e89904879 (patch) | |
| tree | 5ed59d75ecebfa51441578d291dbb556f09c27f8 /Lib | |
| parent | 1b97ed5abcad78c9513d605f0cb6b1936599a7b2 (diff) | |
| parent | 5eb01530b2bfba81b09e5129caabeada2d8dc487 (diff) | |
| download | cpython-e190fac5f957c6da69fa7401a290291e89904879.zip cpython-e190fac5f957c6da69fa7401a290291e89904879.tar.gz cpython-e190fac5f957c6da69fa7401a290291e89904879.tar.bz2 | |
Issue #20027: Fixed locale aliases for devanagari locales.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/locale.py | 7 | ||||
| -rw-r--r-- | Lib/test/test_locale.py | 14 |
2 files changed, 18 insertions, 3 deletions
diff --git a/Lib/locale.py b/Lib/locale.py index b479b09..4c5c7a1 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -1309,7 +1309,7 @@ locale_alias = { 'korean.euc': 'ko_KR.eucKR', 'ks': 'ks_IN.UTF-8', 'ks_in': 'ks_IN.UTF-8', - 'ks_in@devanagari': 'ks_IN@devanagari.UTF-8', + 'ks_in@devanagari': 'ks_IN.UTF-8@devanagari', 'kw': 'kw_GB.ISO8859-1', 'kw_gb': 'kw_GB.ISO8859-1', 'kw_gb.iso88591': 'kw_GB.ISO8859-1', @@ -1474,8 +1474,9 @@ locale_alias = { 'rw_rw': 'rw_RW.ISO8859-1', 'rw_rw.iso88591': 'rw_RW.ISO8859-1', 'sd': 'sd_IN.UTF-8', - 'sd@devanagari': 'sd_IN@devanagari.UTF-8', - 'sd_in@devanagari': 'sd_IN@devanagari.UTF-8', + 'sd@devanagari': 'sd_IN.UTF-8@devanagari', + 'sd_in': 'sd_IN.UTF-8', + 'sd_in@devanagari': 'sd_IN.UTF-8@devanagari', 'se_no': 'se_NO.UTF-8', 'serbocroatian': 'sr_RS.UTF-8@latin', 'sh': 'sr_RS.UTF-8@latin', diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py index 76202df..726c2f9 100644 --- a/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py @@ -422,6 +422,20 @@ class NormalizeTest(unittest.TestCase): self.check('ca_ES@valencia', 'ca_ES.ISO8859-1@valencia') self.check('ca@valencia', 'ca_ES.ISO8859-1@valencia') + def test_devanagari_modifier(self): + self.check('ks_IN.UTF-8@devanagari', 'ks_IN.UTF-8@devanagari') + self.check('ks_IN@devanagari', 'ks_IN.UTF-8@devanagari') + self.check('ks@devanagari', 'ks_IN.UTF-8@devanagari') + self.check('ks_IN.UTF-8', 'ks_IN.UTF-8') + self.check('ks_IN', 'ks_IN.UTF-8') + self.check('ks', 'ks_IN.UTF-8') + self.check('sd_IN.UTF-8@devanagari', 'sd_IN.UTF-8@devanagari') + self.check('sd_IN@devanagari', 'sd_IN.UTF-8@devanagari') + self.check('sd@devanagari', 'sd_IN.UTF-8@devanagari') + self.check('sd_IN.UTF-8', 'sd_IN.UTF-8') + self.check('sd_IN', 'sd_IN.UTF-8') + self.check('sd', 'sd_IN.UTF-8') + class TestMiscellaneous(unittest.TestCase): def test_getpreferredencoding(self): |