[Python-checkins] r72376 - in python/branches/py3k: Lib/locale.py

[jeroen.ruigrok]

Author: jeroen.ruigrok
Date: Wed May  6 07:33:24 2009
New Revision: 72376

Log:
Merged revisions 72375 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72375 | jeroen.ruigrok | 2009-05-06 07:25:42 +0200 (wo, 06 mei 2009) | 5 lines
  
  Wrap getpreferredencoding()'s use of setlocale in a try/except to prevent
  us from raising an exception when the locale is invalid.
  
  Issue #1443504
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/locale.py

Modified: python/branches/py3k/Lib/locale.py
==============================================================================
--- python/branches/py3k/Lib/locale.py	(original)
+++ python/branches/py3k/Lib/locale.py	Wed May  6 07:33:24 2009
@@ -564,7 +564,10 @@
             according to the system configuration."""
             if do_setlocale:
                 oldloc = setlocale(LC_CTYPE)
-                setlocale(LC_CTYPE, "")
+                try:
+                    setlocale(LC_CTYPE, "")
+                except:
+                    pass
                 result = nl_langinfo(CODESET)
                 setlocale(LC_CTYPE, oldloc)
                 return result