diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2011-05-17 11:03:54 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2011-05-17 11:03:54 (GMT) |
| commit | 6edd8c1faf64a118d85355159e5363bba69efe87 (patch) | |
| tree | 33471131519e89939d60131db959819d9f4214d3 /Lib/locale.py | |
| parent | e5720b989f58536e027a1069401120b0f49364a2 (diff) | |
| parent | 02a67ac72be5adb37431b18c3f4b7cb060be6e16 (diff) | |
| download | cpython-6edd8c1faf64a118d85355159e5363bba69efe87.zip cpython-6edd8c1faf64a118d85355159e5363bba69efe87.tar.gz cpython-6edd8c1faf64a118d85355159e5363bba69efe87.tar.bz2 | |
(merge) Fix #10154 and #10090: locale normalizes the UTF-8 encoding to "UTF-8" instead of "UTF8"
On MacOSX and OpenBSD (and possibly other BSDs) "en_US.UTF-8" is a valid locale
while "en_US.UTF8" is not. As the former works on Linux as well it is better
to normalize to that value.
Diffstat (limited to 'Lib/locale.py')
| -rw-r--r-- | Lib/locale.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/locale.py b/Lib/locale.py index 7b987be..0f6fe53 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -643,7 +643,7 @@ locale_encoding_alias = { 'tactis': 'TACTIS', 'euc_jp': 'eucJP', 'euc_kr': 'eucKR', - 'utf_8': 'UTF8', + 'utf_8': 'UTF-8', 'koi8_r': 'KOI8-R', 'koi8_u': 'KOI8-U', # XXX This list is still incomplete. If you know more |