[Python-checkins] r80180 - in python/branches/release26-maint: Include/pyport.h Lib/test/test_locale.py Misc/NEWS

[ronald.oussoren]

Author: ronald.oussoren
Date: Sun Apr 18 16:34:22 2010
New Revision: 80180

Log:
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
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Include/pyport.h
   python/branches/release26-maint/Lib/test/test_locale.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Include/pyport.h
==============================================================================
--- python/branches/release26-maint/Include/pyport.h	(original)
+++ python/branches/release26-maint/Include/pyport.h	Sun Apr 18 16:34:22 2010
@@ -512,6 +512,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
@@ -529,7 +539,6 @@
 #undef toupper
 #define toupper(c) towupper(btowc(c))
 #endif
-#endif
 
 
 /* Declarations for symbol visibility.

Modified: python/branches/release26-maint/Lib/test/test_locale.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_locale.py	(original)
+++ python/branches/release26-maint/Lib/test/test_locale.py	Sun Apr 18 16:34:22 2010
@@ -10,7 +10,13 @@
 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:

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun Apr 18 16:34:22 2010
@@ -28,6 +28,8 @@
 - 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
 -------