Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 15:32:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged revisions 72399 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72399 | jeroen.ruigrok | 2009-05-06 15:16:36 +0200 (wo, 06 mei 2009) | 4 lines

  Be more explicit about the error we are catching.

  Requested by: Antoine Pitrou
........
This commit is contained in:
Jeroen Ruigrok van der Werven 2009-05-06 13:18:35 +00:00
parent 741191f17a
commit 6ca2e0ac5b
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/locale.py
View file

@ -566,7 +566,7 @@ def getpreferredencoding(do_setlocale = True):
oldloc = setlocale(LC_CTYPE)
try:
setlocale(LC_CTYPE, "")
except:
except Error:
pass
result = nl_langinfo(CODESET)
setlocale(LC_CTYPE, oldloc)