commit 6a448d4c2eac16af4c451b43c6dc46cf287b1671
author Antoine Pitrou <solipsis@pitrou.net> Mon Oct 19 19:43:09 2009 +0000
committer Antoine Pitrou <solipsis@pitrou.net> Mon Oct 19 19:43:09 2009 +0000
tree 27935dbb967bd6714bb6a4e1c3cbc862dc902b21
parent 86906f783162d204b43b976ab81c53b8a57098bd

Issue #7080: locale.strxfrm() raises a MemoryError on 64-bit non-Windows
platforms, and assorted locale fixes by Derk Drukker.

Lib/locale.py

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 @@
                     # 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