From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 17 May 2011 12:49:44 +0000 (+0200)
Subject: Fix for issue 10154, merge from 3.2
X-Git-Tag: v3.3.0a1~2256
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b7ea91e3dbb08ec1d4ddaa196f745596ebd1830;p=thirdparty%2FPython%2Fcpython.git

Fix for issue 10154, merge from 3.2
---

2b7ea91e3dbb08ec1d4ddaa196f745596ebd1830
diff --cc Misc/NEWS
index c774b4826116,7db72e77696a..c214cc588984
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -999,6 -698,13 +999,9 @@@ Librar
    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 #10684: shutil.move used to delete a folder on case insensitive
 -  filesystems when the source and destination name where the same except
 -  for the case.
 -
  - 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.