backport test skip for test_locale on Mac OS X

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 2b1eedb5e0b1c6b3fe6baaedfaa729494316466d..014a87af5c86b0e1edd018c97d876501d2d6dfd0 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -702,6 +702,7 @@ _expectations = {
         test_gl
         test_imgfile
         test_largefile
+        test_locale
         test_linuxaudiodev
         test_minidom
         test_nis

diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
index 0040a20899af109902356871f73118bb917fed0b..eb14924364ef77675d389f6d1fad1a894ca4d820 100644 (file)
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -1,7 +1,9 @@
-from test_support import verbose
+from test_support import verbose, TestSkipped
 import locale
 import sys
 
+if sys.platform == 'darwin':
+    raise TestSkipped("Locale support on MacOSX is minimal and cannot be tested")
 oldlocale = locale.setlocale(locale.LC_NUMERIC)
 
 tloc = "en_US"