traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for issue 10154, merge from 3.2

This commit is contained in:
Ronald Oussoren 2011-05-17 14:49:44 +02:00
parent bd3d5cf96a 6edd8c1faf
commit 2b7ea91e3d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/locale.py
View File

@ -643,7 +643,7 @@ locale_encoding_alias = {
'tactis': 'TACTIS', 'tactis': 'TACTIS',
'euc_jp': 'eucJP', 'euc_jp': 'eucJP',
'euc_kr': 'eucKR', 'euc_kr': 'eucKR',
'utf_8': 'UTF8', 'utf_8': 'UTF-8',
'koi8_r': 'KOI8-R', 'koi8_r': 'KOI8-R',
'koi8_u': 'KOI8-U', 'koi8_u': 'KOI8-U',
# XXX This list is still incomplete. If you know more # XXX This list is still incomplete. If you know more

3
Misc/NEWS
View File

@ -999,6 +999,9 @@ Library
and a non-zero offset, and an attempt to read past the end of file is made 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. (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 - 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 than the currently problematic Apple-supplied one, when running with the
64-/32-bit installer variant. 64-/32-bit installer variant.