commit 372954e059956aab354d9abfa7fcdcaca40a6079
author Ronald Oussoren <ronaldoussoren@mac.com> Tue May 17 13:22:30 2011 +0200
committer Ronald Oussoren <ronaldoussoren@mac.com> Tue May 17 13:22:30 2011 +0200
tree cd33015ecddf3f9c324bdbf65d7e7cdd74c46913
parent bfbd1a2fd4f304e780d7652daf425fb473097abe

(backport)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.

Lib/locale.py

diff --git a/Lib/locale.py b/Lib/locale.py
index 921f4f6..bb4aa37 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -621,7 +621,7 @@
     '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