[Python-checkins] cpython (merge 3.2 -> default): Fix for issue 10154, merge from 3.2

[ronald.oussoren]

http://hg.python.org/cpython/rev/3d7cb852a176
changeset:   70175:3d7cb852a176
parent:      70170:4b7c29201c60
parent:      70173:454d13e535ff
user:        Ronald Oussoren <ronaldoussoren at mac.com>
date:        Tue May 17 14:49:44 2011 +0200
summary:
  Fix for issue 10154, merge from 3.2

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
@@ -643,7 +643,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
@@ -999,6 +999,9 @@
   and a non-zero offset, and an attempt to read past the end of file is made
   (IndexError is raised instead).  Patch by Ross Lagerwall.
 
+- 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 #10907: Warn OS X 10.6 IDLE users to use ActiveState Tcl/Tk 8.5, rather
   than the currently problematic Apple-supplied one, when running with the
   64-/32-bit installer variant.

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