From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 18 Apr 2010 15:02:38 +0000 (+0000)
Subject: Merged revisions 80178 via svnmerge from
X-Git-Tag: v3.2a1~1113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=501aeffba3673fdce742054a5e0014dbe3ab40a7;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Include/pyport.h b/Include/pyport.h
index 9df74ce98953..e40c76d89d95 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -625,6 +625,16 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
 #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
@@ -642,7 +652,6 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
 #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 8c17f8770c74..9439522fc90d 100644
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -8,7 +8,15 @@ enUS_locale = None
 
 def get_enUS_locale():
     global enUS_locale
-    if sys.platform.startswith("win"):
+    if sys.platform == 'darwin':
+        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")
+    elif sys.platform.startswith("win"):
         tlocs = ("En", "English")
     else:
         tlocs = ("en_US.UTF-8", "en_US.ISO8859-1", "en_US.US-ASCII", "en_US")
diff --git a/Misc/NEWS b/Misc/NEWS
index 5b08d19d6393..d8828988cb73 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -261,6 +261,9 @@ Core and Builtins
 
 - Code objects now support weak references.
 
+- Issue #7072: isspace(0xa0) is true on Mac OS X
+
+
 C-API
 -----