Issue #23998: PyImport_ReInitLock() now checks for lock allocation error

diff --cc Misc/NEWS
index 6f2cd12aa965aa45de66050e4c01f8f4c426ae2d,9c9079225f6babe398fb4fd98b6535a701773644..a2204dd9b0edace7ba39828333f78057229e633e
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -167,84 -72,6 +167,89 @@@ Librar
  - Issue #23745: The new email header parser now handles duplicate MIME
    parameter names without error, similar to how get_param behaves.
  
 +- Issue #22117: Fix os.utime(), it now rounds the timestamp towards minus
 +  infinity (-inf) instead of rounding towards zero.
 +
 +- Issue #23310: Fix MagicMock's initializer to work with __methods__, just
 +  like configure_mock().  Patch by Kasia Jachim.
 +
 +Build
 +-----
 +
 +- Issue #23817: FreeBSD now uses "1.0" the the SOVERSION as other operating
 +  systems, instead of just "1".
 +
 +- Issue #23501: Argument Clinic now generates code into separate files by default.
 +
 +Tests
 +-----
 +
 +- Issue #23799: Added test.support.start_threads() for running and
 +  cleaning up multiple threads.
 +
 +- Issue #22390: test.regrtest now emits a warning if temporary files or
 +  directories are left after running a test.
 +
 +Tools/Demos
 +-----------
 +
 +- Issue #18128: pygettext now uses standard +NNNN format in the
 +  POT-Creation-Date header.
 +
 +- Issue #23935: Argument Clinic's understanding of format units
 +  accepting bytes, bytearrays, and buffers is now consistent with
 +  both the documentation and the implementation.
 +
 +- Issue #23944: Argument Clinic now wraps long impl prototypes at column 78.
 +
 +- Issue #20586: Argument Clinic now ensures that functions without docstrings
 +  have signatures.
 +
 +- Issue #23492: Argument Clinic now generates argument parsing code with
 +  PyArg_Parse instead of PyArg_ParseTuple if possible.
 +
 +- Issue #23500: Argument Clinic is now smarter about generating the "#ifndef"
 +  (empty) definition of the methoddef macro: it's only generated once, even
 +  if Argument Clinic processes the same symbol multiple times, and it's emitted
 +  at the end of all processing rather than immediately after the first use.
 +
++C API
++-----
++
++- Issue #23998: PyImport_ReInitLock() now checks for lock allocation error
++
 +
 +What's New in Python 3.5.0 alpha 3?
 +===================================
 +
 +Release date: 2015-03-28
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #23573: Increased performance of string search operations (str.find,
 +  str.index, str.count, the in operator, str.split, str.partition) with
 +  arguments of different kinds (UCS1, UCS2, UCS4).
 +
 +- Issue #23753: Python doesn't support anymore platforms without stat() or
 +  fstat(), these functions are always required.
 +
 +- Issue #23681: The -b option now affects comparisons of bytes with int.
 +
 +- Issue #23632: Memoryviews now allow tuple indexing (including for
 +  multi-dimensional memoryviews).
 +
 +- Issue #23192: Fixed generator lambdas.  Patch by Bruno Cauet.
 +
 +- Issue #23629: Fix the default __sizeof__ implementation for variable-sized
 +  objects.
 +
 +Library
 +-------
 +
 +- Issue #14260: The groupindex attribute of regular expression pattern object
 +  now is non-modifiable mapping.
 +
  - Issue #23792: Ignore KeyboardInterrupt when the pydoc pager is active.
    This mimics the behavior of the standard unix pagers, and prevents
    pipepager from shutting down while the pager itself is still running.

diff --cc Python/import.c
Simple merge