From: Jack Jansen <jack.jansen@cwi.nl>
Date: Wed, 15 Jan 2003 23:43:02 +0000 (+0000)
Subject: On Mac OS X calling setlocale will raise locale.Error. This isn't fatal,
X-Git-Tag: v2.3c1~2442
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=883400933810ac62631c391766c1380a65fbc4de;p=python

On Mac OS X calling setlocale will raise locale.Error. This isn't fatal,
so just continue testing. Fixes #668787.
---

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 1e16def9a7..4e74394ac8 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"