diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2011-05-17 14:49:44 +0200 |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2011-05-17 14:49:44 +0200 |
| commit | 2b7ea91e3dbb08ec1d4ddaa196f745596ebd1830 (patch) | |
| tree | b32b01e5747de961d222d829cbd53d0cc0fb114f | |
| parent | bd3d5cf96af2b56ed55773a57e850f165ffe3836 (diff) | |
| parent | 6edd8c1faf64a118d85355159e5363bba69efe87 (diff) | |
| download | cpython-git-2b7ea91e3dbb08ec1d4ddaa196f745596ebd1830.tar.gz | |
Fix for issue 10154, merge from 3.2
| -rw-r--r-- | Lib/locale.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/locale.py b/Lib/locale.py index 7b987bed06..0f6fe53483 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -643,7 +643,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 @@ -999,6 +999,9 @@ Library 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. |