From 0746619c0496c14ab6480615e9b9d54ea8c8ced8 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Sun, 18 Apr 2010 14:34:22 +0000 Subject: [PATCH] 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 ........ --- Include/pyport.h | 11 ++++++++++- Lib/test/test_locale.py | 8 +++++++- Misc/NEWS | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Include/pyport.h b/Include/pyport.h index 54411f259724..64bbb0362d1d 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -512,6 +512,16 @@ extern int fdatasync(int); #ifdef __FreeBSD__ #include #if __FreeBSD_version > 500039 +# define _PY_PORT_CTYPE_UTF8_ISSUE +#endif +#endif + + +#if defined(__APPLE__) +# define _PY_PORT_CTYPE_UTF8_ISSUE +#endif + +#ifdef _PY_PORT_CTYPE_UTF8_ISSUE #include #include #undef isalnum @@ -529,7 +539,6 @@ extern int fdatasync(int); #undef toupper #define toupper(c) towupper(btowc(c)) #endif -#endif /* Declarations for symbol visibility. diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py index 2612c79fbbc2..c05776790078 100644 --- a/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py @@ -10,7 +10,13 @@ enUS_locale = None def get_enUS_locale(): global enUS_locale if sys.platform == 'darwin': - raise TestSkipped("Locale support on MacOSX is minimal") + 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 SkipTest("Locale support on MacOSX is minimal") if sys.platform.startswith("win"): tlocs = ("En", "English") else: diff --git a/Misc/NEWS b/Misc/NEWS index 915e293b3dbe..95d8be32e3a1 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -28,6 +28,8 @@ Core and Builtins - Issue #7820: The parser tokenizer restores all bytes in the right if the BOM check fails. +- Issue #7072: isspace(0xa0) is true on Mac OS X + Library ------- -- 2.47.3