From: Jeroen Ruigrok van der Werven <asmodai@in-nomine.org>
Date: Wed, 6 May 2009 13:18:35 +0000 (+0000)
Subject: Merged revisions 72399 via svnmerge from
X-Git-Tag: v3.1b1~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ca2e0ac5bc26cdf537ad256fae0c4b6942d1213;p=thirdparty%2FPython%2Fcpython.git

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