From 451ae18751671a8964f29df18a8b10f94ba55946 Mon Sep 17 00:00:00 2001 From: Anthony Baxter Date: Fri, 3 Jun 2005 15:04:15 +0000 Subject: [PATCH] [ 1197218 ] test_locale fix on modern linux On more modern linuxes (and probably others) straight 'en_US' isn't a valid locale. Make the code try a couple of alternates. backport candidate --- Lib/test/test_locale.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py index d8f79250525..2a33aafb880 100644 --- a/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py @@ -7,16 +7,18 @@ if sys.platform == 'darwin': oldlocale = locale.setlocale(locale.LC_NUMERIC) if sys.platform.startswith("win"): - tloc = "en" -elif sys.platform.startswith("freebsd"): - tloc = "en_US.US-ASCII" + tlocs = ("en",) else: - tloc = "en_US" + tlocs = ("en_US.UTF-8", "en_US.US-ASCII", "en_US") -try: - locale.setlocale(locale.LC_NUMERIC, tloc) -except locale.Error: - raise ImportError, "test locale %s not supported" % tloc +for tloc in tlocs: + try: + locale.setlocale(locale.LC_NUMERIC, tloc) + break + except locale.Error: + continue +else: + raise ImportError, "test locale not supported (tried %s)"%(', '.join(tlocs)) def testformat(formatstr, value, grouping = 0, output=None): if verbose: