summaryrefslogtreecommitdiffstats
path: root/Lib/locale.py
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2011-05-17 10:44:54 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2011-05-17 10:44:54 (GMT)
commit02a67ac72be5adb37431b18c3f4b7cb060be6e16 (patch)
tree1aa59e24e240d529536068162aae0362efe809ca /Lib/locale.py
parente98f177ca64de8a4ab779902a3a5926d48f035f2 (diff)
downloadcpython-02a67ac72be5adb37431b18c3f4b7cb060be6e16.zip
cpython-02a67ac72be5adb37431b18c3f4b7cb060be6e16.tar.gz
cpython-02a67ac72be5adb37431b18c3f4b7cb060be6e16.tar.bz2
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.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/locale.py b/Lib/locale.py
index 8c44625..a1283a3 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -640,7 +640,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