test___all__ was failing on WIndows because locale.py doesn't really

know which names it exports.  Didn't fix its ignorance, but patched
over the consequence.

1 files changed, 10 insertions, 3 deletions

diff --git a/Lib/locale.py b/Lib/locale.py
index 24e4c0e437..7a515f4564 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -16,12 +16,12 @@ import string, sys
 # Try importing the _locale module.
 #
 # If this fails, fall back on a basic 'C' locale emulation.
-#
 
+# Yuck:  LC_MESSAGES is non-standard:  can't tell whether it exists before
+# trying the import.  So __all__ is also fiddled at the end of the file.
 __all__ = ["setlocale","Error","localeconv","strcoll","strxfrm",
            "format","str","atof","atoi","LC_CTYPE","LC_COLLATE",
-           "LC_TIME","LC_MONETARY","LC_NUMERIC","LC_MESSAGES",
-           "LC_ALL","CHAR_MAX"]
+           "LC_TIME","LC_MONETARY","LC_NUMERIC", "LC_ALL","CHAR_MAX"]
 
 try:
 
@@ -700,6 +700,13 @@ def _print_locale():
 
 ###
 
+try:
+    LC_MESSAGES
+except:
+    pass
+else:
+    __all__.append("LC_MESSAGES")
+
 if __name__=='__main__':
     print 'Locale aliasing:'
     print