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
........

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