summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2003-01-15 23:43:02 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2003-01-15 23:43:02 (GMT)
commit883400933810ac62631c391766c1380a65fbc4de (patch)
treeb04c6ff4c4d5bd85e09e805b6fe092412ac60ba6 /Lib
parentc9083b66bd6ae6956df13e4b4fdcd025d6d0436b (diff)
downloadcpython-883400933810ac62631c391766c1380a65fbc4de.zip
cpython-883400933810ac62631c391766c1380a65fbc4de.tar.gz
cpython-883400933810ac62631c391766c1380a65fbc4de.tar.bz2
On Mac OS X calling setlocale will raise locale.Error. This isn't fatal,
so just continue testing. Fixes #668787.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_logging.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 1e16def..4e74394 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -31,8 +31,9 @@ import logging, logging.handlers, logging.config
try:
locale.setlocale(locale.LC_ALL, '')
-except ValueError:
+except (ValueError, locale.Error):
# this happens on a Solaris box which only supports "C" locale
+ # or a Mac OS X box which supports very little locale stuff at all
pass
BANNER = "-- %-10s %-6s ---------------------------------------------------\n"