From 02a1b42e7cd99c18c99a1bb852b393a30b6afcfc Mon Sep 17 00:00:00 2001 From: Jeroen Ruigrok van der Werven Date: Wed, 6 May 2009 13:22:35 +0000 Subject: [PATCH] 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 ........ ................ --- Lib/locale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/locale.py b/Lib/locale.py index 7d06b06614b5..57829e5f62fc 100644 --- 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) -- 2.47.3