[Python-checkins] cpython (2.7): (backport)Fix #10154 and #10090: locale normalizes the UTF-8 encoding to

[ronald.oussoren]

http://hg.python.org/cpython/rev/932de36903e7
changeset:   70171:932de36903e7
branch:      2.7
parent:      70168:c449d3c3e0da
user:        Ronald Oussoren <ronaldoussoren at mac.com>
date:        Tue May 17 13:22:30 2011 +0200
summary:
  (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.

files:
  Lib/locale.py |  2 +-
  Misc/NEWS     |  3 +++
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Lib/locale.py b/Lib/locale.py
--- 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
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -80,6 +80,9 @@
 Library
 -------
 
+- Issue #10154, #10090: change the normalization of UTF-8 to "UTF-8" instead
+  of "UTF8" in the locale module as the latter is not supported MacOSX and OpenBSD.
+
 - Issue #9516: avoid errors in sysconfig when MACOSX_DEPLOYMENT_TARGET is 
   set in shell.
 

-- 
Repository URL: http://hg.python.org/cpython