summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristján Valur Jónsson <kristjan@ccpgames.com>2007-05-07 19:31:41 +0000
committerKristján Valur Jónsson <kristjan@ccpgames.com>2007-05-07 19:31:41 +0000
commita01d6609b9e90584da765201b1c8e861e7308cd4 (patch)
treef612b79646a25be86729c434faed58f7685be65c
parenta1392d5ace266878ad6a3ff9dba96336ecde7fb3 (diff)
downloadcpython-git-a01d6609b9e90584da765201b1c8e861e7308cd4.tar.gz
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.
-rw-r--r--Lib/test/test_locale.py2
1 files changed, 1 insertions, 1 deletions
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")