commit 4965b48c6852ed9a45f9f4c242c01468861a0242
author Jeroen Ruigrok van der Werven <asmodai@in-nomine.org> Wed May 06 13:21:17 2009 +0000
committer Jeroen Ruigrok van der Werven <asmodai@in-nomine.org> Wed May 06 13:21:17 2009 +0000
tree 192816107bb1353100701ef51cc54209ae06a416
parent 466b4652763a8cf32551b4b9ae5452900554db8a

Merged revisions 72399 via svnmerge from
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
........

Lib/locale.py

diff --git a/Lib/locale.py b/Lib/locale.py
index 1536bb5..df5ab39 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -548,7 +548,7 @@
                 oldloc = setlocale(LC_CTYPE)
                 try:
                     setlocale(LC_CTYPE, "")
-                except:
+                except Error:
                     pass
                 result = nl_langinfo(CODESET)
                 setlocale(LC_CTYPE, oldloc)