merge 3.4 (#24407)

diff --cc Lib/test/test_dict.py
Simple merge

diff --cc Misc/NEWS
index f440b18f3094c412e82b897ef7457aafa620f267,9e78e77df78e48dc6cbac686930729a7226e9cf7..1391c82862adbdf7c72aca9c818dd6f0ba4429fe
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -14,26 -14,55 +14,28 @@@ Core and Builtin
    object now always allocates place for trailing null byte and it's buffer now
    is always null-terminated.
  
 -- Issue #24115: Update uses of PyObject_IsTrue(), PyObject_Not(),
 -  PyObject_IsInstance(), PyObject_RichCompareBool() and _PyDict_Contains()
 -  to check for and handle errors correctly.
 -
 -- Issue #24257: Fixed system error in the comparison of faked
 -  types.SimpleNamespace.
 +- Upgrade to Unicode 8.0.0.
  
 -- Issue #22939: Fixed integer overflow in iterator object.  Patch by
 -  Clement Rouault.
 +- Issue #24345: Add Py_tp_finalize slot for the stable ABI.
  
 -- Issue #23985: Fix a possible buffer overrun when deleting a slice from
 -  the front of a bytearray and then appending some other bytes data.
 +- Issue #24400: Introduce a distinct type for PEP 492 coroutines; add
 +  types.CoroutineType, inspect.getcoroutinestate, inspect.getcoroutinelocals;
 +  coroutines no longer use CO_GENERATOR flag; sys.set_coroutine_wrapper
 +  works only for 'async def' coroutines; inspect.iscoroutine no longer
 +  uses collections.abc.Coroutine, it's intended to test for pure 'async def'
 +  coroutines only; add new opcode: GET_YIELD_FROM_ITER; fix generators wrapper
 +  used in types.coroutine to be instance of collections.abc.Generator;
 +  collections.abc.Awaitable and collections.abc.Coroutine can no longer
 +  be used to detect generator-based coroutines--use inspect.isawaitable
 +  instead.
  
 -- Issue #24102: Fixed exception type checking in standard error handlers.
 +- Issue #24450: Add gi_yieldfrom to generators and cr_await to coroutines.
 +  Contributed by Benno Leslie and Yury Selivanov.
  
 -- Issue #23757:  PySequence_Tuple() incorrectly called the concrete list API
 -  when the data was a list subclass.
 +- Issue #19235: Add new RecursionError exception. Patch by Georg Brandl.
  
 -- Issue #24096: Make warnings.warn_explicit more robust against mutation of the
 -  warnings.filters list.
 -
 -- Issue #23996: Avoid a crash when a delegated generator raises an
 -  unnormalized StopIteration exception.  Patch by Stefan Behnel.
 -
 -- Issue #24022: Fix tokenizer crash when processing undecodable source code.
 -
 -- Issue #23309: Avoid a deadlock at shutdown if a daemon thread is aborted
 -  while it is holding a lock to a buffered I/O object, and the main thread
 -  tries to use the same I/O object (typically stdout or stderr).  A fatal
 -  error is emitted instead.
 -
 -- Issue #22977: Fixed formatting Windows error messages on Wine.
 -  Patch by Martin Panter.
 -
 -- Issue #23803: Fixed str.partition() and str.rpartition() when a separator
 -  is wider then partitioned string.
 -
 -- Issue #23192: Fixed generator lambdas.  Patch by Bruno Cauet.
 -
 -- Issue #23629: Fix the default __sizeof__ implementation for variable-sized
 -  objects.
 -
 -- Issue #24044: Fix possible null pointer dereference in list.sort in out of
 -  memory conditions.
 -
 -- Issue #21354: PyCFunction_New function is exposed by python DLL again.
 -
+ - Issue #24407: Fix crash when dict is mutated while being updated.
+ 
  Library
  -------
  

diff --cc Objects/dictobject.c
Simple merge