Merged revisions 72400 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r72400 | jeroen.ruigrok | 2009-05-06 15:18:35 +0200 (wo, 06 mei 2009) | 11 lines

  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 7d06b06614b5ba7398a25777427a1599ef5b7fa0..57829e5f62fc29414bab2cdd08736650556ebabe 100644 (file)
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -559,7 +559,7 @@ else:
                 oldloc = setlocale(LC_CTYPE)
                 try:
                     setlocale(LC_CTYPE, "")
-                except:
+                except Error:
                     pass
                 result = nl_langinfo(CODESET)
                 setlocale(LC_CTYPE, oldloc)