diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-04-18 13:47:49 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-04-18 13:47:49 (GMT) |
| commit | 37805e5c1f082c753f9088e48dc945afdba29779 (patch) | |
| tree | 7265feba7893d8a28e683bb684b863e615d46be7 | |
| parent | cf445fced474f4df3b67ec3cb4ae6f761173d93c (diff) | |
| download | cpython-37805e5c1f082c753f9088e48dc945afdba29779.zip cpython-37805e5c1f082c753f9088e48dc945afdba29779.tar.gz cpython-37805e5c1f082c753f9088e48dc945afdba29779.tar.bz2 | |
Fix for issue #7072
| -rw-r--r-- | Include/pyport.h | 11 | ||||
| -rw-r--r-- | Lib/test/test_locale.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 19 insertions, 2 deletions
diff --git a/Include/pyport.h b/Include/pyport.h index a6ddbee..e02a5fd 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -666,6 +666,16 @@ extern int fdatasync(int); #ifdef __FreeBSD__ #include <osreldate.h> #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 <ctype.h> #include <wctype.h> #undef isalnum @@ -683,7 +693,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 4510409..7f0f61d 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 unittest.SkipTest("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 unittest.SkipTest("Locale support on MacOSX is minimal") if sys.platform.startswith("win"): tlocs = ("En", "English") else: @@ -15,6 +15,8 @@ Core and Builtins - Issue #8417: Raise an OverflowError when an integer larger than sys.maxsize is passed to bytearray. +- Issue #7072: isspace(0xa0) is true on Mac OS X + Library ------- |