[Python-checkins] r80178 - in python/trunk: Include/pyport.h Lib/test/test_locale.py Misc/NEWS

[ronald.oussoren]

Author: ronald.oussoren
Date: Sun Apr 18 15:47:49 2010
New Revision: 80178

Log:
Fix for issue #7072


Modified:
   python/trunk/Include/pyport.h
   python/trunk/Lib/test/test_locale.py
   python/trunk/Misc/NEWS

Modified: python/trunk/Include/pyport.h
==============================================================================
--- python/trunk/Include/pyport.h	(original)
+++ python/trunk/Include/pyport.h	Sun Apr 18 15:47:49 2010
@@ -666,6 +666,16 @@
 #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 @@
 #undef toupper
 #define toupper(c) towupper(btowc(c))
 #endif
-#endif
 
 
 /* Declarations for symbol visibility.

Modified: python/trunk/Lib/test/test_locale.py
==============================================================================
--- python/trunk/Lib/test/test_locale.py	(original)
+++ python/trunk/Lib/test/test_locale.py	Sun Apr 18 15:47:49 2010
@@ -10,7 +10,13 @@
 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:

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sun Apr 18 15:47:49 2010
@@ -15,6 +15,8 @@
 - 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
 -------