summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Ruigrok van der Werven <asmodai@in-nomine.org>2009-05-06 13:18:35 +0000
committerJeroen Ruigrok van der Werven <asmodai@in-nomine.org>2009-05-06 13:18:35 +0000
commit6ca2e0ac5bc26cdf537ad256fae0c4b6942d1213 (patch)
treedb099cdf859a12c85f082b5fe5bf7c0d8ffe4146
parent741191f17a921191355c1a67ca9f7fda08c3ae57 (diff)
downloadcpython-git-6ca2e0ac5bc26cdf537ad256fae0c4b6942d1213.tar.gz
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 ........
-rw-r--r--Lib/locale.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/locale.py b/Lib/locale.py
index 75a6435430..4441e6d4d0 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)