commit 6ca2e0ac5bc26cdf537ad256fae0c4b6942d1213
author Jeroen Ruigrok van der Werven <asmodai@in-nomine.org> Wed May 06 13:18:35 2009 +0000
committer Jeroen Ruigrok van der Werven <asmodai@in-nomine.org> Wed May 06 13:18:35 2009 +0000
tree db099cdf859a12c85f082b5fe5bf7c0d8ffe4146
parent 741191f17a921191355c1a67ca9f7fda08c3ae57

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 75a6435..4441e6d 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -566,7 +566,7 @@
                 oldloc = setlocale(LC_CTYPE)
                 try:
                     setlocale(LC_CTYPE, "")
-                except:
+                except Error:
                     pass
                 result = nl_langinfo(CODESET)
                 setlocale(LC_CTYPE, oldloc)