Merged revisions 76405 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76405 | ronald.oussoren | 2009-11-19 18:15:31 +0100 (Thu, 19 Nov 2009) | 21 lines

  Merged revisions 76403 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76403 | ronald.oussoren | 2009-11-19 17:25:21 +0100 (Thu, 19 Nov 2009) | 14 lines

    Fix for issue #7085

    On MacOSX 10.6 the CoreFoundation framework must be initialized on the main
    thread, the constructor function in that framework will cause an SIGABRT when
    it is called on any other thread.

    Because a number of extension link (indirectly) to CoreFoundation and the
    Python core itself didn't the interpreter crashed when importing some
    extensions, such as _locale, on a secondary thread.

    This fix ensures that Python is linked to CoreFoundation on OSX, which results
    in the CoreFoundation constructor being called when Python is loaded. This
    does not require code changes.
  ........
................
diff --git a/Misc/NEWS b/Misc/NEWS
index fada490..bd944ac 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 Core and Builtins
 -----------------
 
+- Issue #7085: Fix crash when importing some extensions in a thread
+  on MacOSX 10.6.
+
 - Issue #7298: fixes for range and reversed(range(...)).  Iteration
   over range(a, b, c) incorrectly gave an empty iterator when a, b and
   c fit in C long but the length of the range did not.  Also fix