From: Kristján Valur Jónsson <kristjan@ccpgames.com>
Date: Mon, 7 May 2007 19:31:41 +0000 (+0000)
Subject: Merge change 54983 from the trunk:  Add the locale "English" to test_locale.py for... 
X-Git-Tag: v2.5.2c1~308
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a01d6609b9e90584da765201b1c8e861e7308cd4;p=python

Merge change 54983 from the trunk:  Add the locale "English" to test_locale.py for a windows run, since "En" isn't legal for the Visual C 8 runtime.  This update restores full testsuite compliance to VisualStudio 2005 builds, apart from unavailible external modules.
---

diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
index 9e264b9c4e..a91d358d64 100644
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -7,7 +7,7 @@ if sys.platform == 'darwin':
 oldlocale = locale.setlocale(locale.LC_NUMERIC)
 
 if sys.platform.startswith("win"):
-    tlocs = ("en",)
+    tlocs = ("En", "English")
 else:
     tlocs = ("en_US.UTF-8", "en_US.US-ASCII", "en_US")