Merged revisions 75537,75539 via svnmerge from
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.
........
diff --git a/Lib/locale.py b/Lib/locale.py
index 54d4c0e..f74207d 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -575,14 +575,13 @@
# 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