commit 3a20d05dcc518646172293ed44a76a3cd1c02d2b
author Ronald Oussoren <ronaldoussoren@mac.com> Sun Apr 18 15:08:43 2010 +0000
committer Ronald Oussoren <ronaldoussoren@mac.com> Sun Apr 18 15:08:43 2010 +0000
tree 059a74e787c8b11052a826022bf67f677cc6d9db
parent 5ec05cdc690a6d51b5657e34e3d2dee8b9a1ec18

Merged revisions 80182 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80182 | ronald.oussoren | 2010-04-18 17:02:38 +0200 (Sun, 18 Apr 2010) | 9 lines

  Merged revisions 80178 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80178 | ronald.oussoren | 2010-04-18 15:47:49 +0200 (Sun, 18 Apr 2010) | 2 lines

    Fix for issue #7072
  ........
................

Lib/test/test_locale.py

diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
index 8c17f87..9439522 100644
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -8,7 +8,15 @@
 
 def get_enUS_locale():
     global enUS_locale
-    if sys.platform.startswith("win"):
+    if sys.platform == 'darwin':
+        import os
+        tlocs = ("en_US.UTF-8", "en_US.ISO8859-1", "en_US")
+        if int(os.uname()[2].split('.')[0]) < 10:
+            # The locale test work fine on OSX 10.6, I (ronaldoussoren)
+            # haven't had time yet to verify if tests work on OSX 10.5
+            # (10.4 is known to be bad)
+            raise unittest.SkipTest("Locale support on MacOSX is minimal")
+    elif sys.platform.startswith("win"):
         tlocs = ("En", "English")
     else:
         tlocs = ("en_US.UTF-8", "en_US.ISO8859-1", "en_US.US-ASCII", "en_US")