[Python-checkins] python/dist/src/Lib/test test_locale.py, 1.9, 1.10

Fri Jun 3 17:04:17 CEST 2005

Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24406/Lib/test
Modified Files:
	test_locale.py 
Log Message:
[ 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
Index: test_locale.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_locale.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10

--- test_locale.py	4 Aug 2004 06:33:51 -0000	1.9
+++ test_locale.py	3 Jun 2005 15:04:15 -0000	1.10
@@ -7,16 +7,18 @@
 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:
