mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-28 04:35:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 75537,75539 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r75537 | antoine.pitrou | 2009-10-19 21:37:25 +0200 (lun., 19 oct. 2009) | 3 lines

  egreen is Derk Drukker + fix NEWS formatting
........
  r75539 | antoine.pitrou | 2009-10-19 21:43:09 +0200 (lun., 19 oct. 2009) | 4 lines

  Issue #7080: locale.strxfrm() raises a MemoryError on 64-bit non-Windows
  platforms, and assorted locale fixes by Derk Drukker.
........
This commit is contained in:
Antoine Pitrou 2009-10-19 19:47:59 +00:00
parent bc740a6951
commit eda95e9db3
6 changed files with 54 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/locale.py
View file

@ -575,14 +575,13 @@ else:
# returning nothing will crash the
# interpreter.
result = 'UTF-8'
setlocale(LC_CTYPE, oldloc)
return result
else:
result = nl_langinfo(CODESET)
if not result and sys.platform == 'darwin':
# See above for explanation
result = 'UTF-8'
return result
### Database