summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSkip Montanaro <skip@pobox.com>2005-09-19 03:54:46 (GMT)
committerSkip Montanaro <skip@pobox.com>2005-09-19 03:54:46 (GMT)
commitf8948ca5d73f1cc02550ad6535f94daffd977cea (patch)
treed4bd2496758d617df5c5fc31fd0538d8d7fd32e5
parent4ed673877dd91172775e0e549bd205efe2c25567 (diff)
downloadcpython-f8948ca5d73f1cc02550ad6535f94daffd977cea.zip
cpython-f8948ca5d73f1cc02550ad6535f94daffd977cea.tar.gz
cpython-f8948ca5d73f1cc02550ad6535f94daffd977cea.tar.bz2
skip _locale test if OS X < 10.4
-rw-r--r--Lib/test/test__locale.py6
-rw-r--r--Misc/NEWS3
2 files changed, 9 insertions, 0 deletions
diff --git a/Lib/test/test__locale.py b/Lib/test/test__locale.py
index 4d7be16..ef4fe8d 100644
--- a/Lib/test/test__locale.py
+++ b/Lib/test/test__locale.py
@@ -2,6 +2,12 @@ from test.test_support import verbose, TestSkipped, run_unittest
from _locale import (setlocale, LC_NUMERIC, RADIXCHAR, THOUSEP, nl_langinfo,
localeconv, Error)
import unittest
+from platform import uname
+
+if uname()[0] == "Darwin":
+ maj, min, mic = [int(part) for part in uname()[2].split(".")]
+ if (maj, min, mic) < (8, 0, 0):
+ raise TestSkipped("locale support broken for OS X < 10.4")
candidate_locales = ['es_UY', 'fr_FR', 'fi_FI', 'es_CO', 'pt_PT', 'it_IT',
'et_EE', 'es_PY', 'no_NO', 'nl_NL', 'lv_LV', 'el_GR', 'be_BY', 'fr_BE',
diff --git a/Misc/NEWS b/Misc/NEWS
index 5eb20ab..df0e16e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.5 alpha 1?
Core and builtins
-----------------
+- test__locale is skipped on OS X < 10.4 (only partial locale support is
+present).
+
- SF bug #893549: parsing keyword arguments was broken with a few format
codes.