diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-10-19 19:43:09 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-10-19 19:43:09 (GMT) |
| commit | 6a448d4c2eac16af4c451b43c6dc46cf287b1671 (patch) | |
| tree | 27935dbb967bd6714bb6a4e1c3cbc862dc902b21 /Lib/locale.py | |
| parent | 86906f783162d204b43b976ab81c53b8a57098bd (diff) | |
| download | cpython-6a448d4c2eac16af4c451b43c6dc46cf287b1671.zip cpython-6a448d4c2eac16af4c451b43c6dc46cf287b1671.tar.gz cpython-6a448d4c2eac16af4c451b43c6dc46cf287b1671.tar.bz2 | |
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 b7aaa52..c50af53 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -578,14 +578,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 |