diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-10-19 19:47:59 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-10-19 19:47:59 (GMT) |
| commit | eda95e9db3e15ebc19979eab948a75272d8cbdcf (patch) | |
| tree | 9e374c5cf279d600943f57543adccf902b6d5c09 /Lib/locale.py | |
| parent | bc740a6951b2d234fc69936c7ff4713a503f20cf (diff) | |
| download | cpython-eda95e9db3e15ebc19979eab948a75272d8cbdcf.zip cpython-eda95e9db3e15ebc19979eab948a75272d8cbdcf.tar.gz cpython-eda95e9db3e15ebc19979eab948a75272d8cbdcf.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/locale.py')
| -rw-r--r-- | Lib/locale.py | 3 |
1 files changed, 1 insertions, 2 deletions
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 @@ 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 |