merge 3.4 (#26171)

diff --cc Misc/NEWS
index 4baf757b5f30ed1a0316155c13963e388b81ac18,5f1929d0b1d53a03574ea39ca362251d4527fd0c..dc375d0e03218ec2a03d61a062ce8af620918c76
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,46 -10,9 +10,49 @@@ Release date: tb
  Core and Builtins
  -----------------
  
 +- Issue #26154: Add a new private _PyThreadState_UncheckedGet() function to get
 +  the current Python thread state, but don't issue a fatal error if it is NULL.
 +  This new function must be used instead of accessing directly the
 +  _PyThreadState_Current variable.  The variable is no more exposed since
 +  Python 3.5.1 to hide the exact implementation of atomic C types, to avoid
 +  compiler issues.
 +
 +- Issue #25731: Fix set and deleting __new__ on a class.
 +
 +- Issue #22995: [UPDATE] Comment out the one of the pickleability tests in
 +  _PyObject_GetState() due to regressions observed in Cython-based projects.
 +
 +- Issue #25961: Disallowed null characters in the type name.
 +
 +- Issue #25973: Fix segfault when an invalid nonlocal statement binds a name
 +  starting with two underscores.
 +
 +- Issue #22995: Instances of extension types with a state that aren't
 +  subclasses of list or dict and haven't implemented any pickle-related
 +  methods (__reduce__, __reduce_ex__, __getnewargs__, __getnewargs_ex__,
 +  or __getstate__), can no longer be pickled.  Including memoryview.
 +
 +- Issue #20440: Massive replacing unsafe attribute setting code with special
 +  macro Py_SETREF.
 +
 +- Issue #25766: Special method __bytes__() now works in str subclasses.
 +
 +- Issue #25421: __sizeof__ methods of builtin types now use dynamic basic size.
 +  This allows sys.getsize() to work correctly with their subclasses with
 +  __slots__ defined.
 +
 +- Issue #25709: Fixed problem with in-place string concatenation and utf-8 cache.
 +
 +- Issue #24097: Fixed crash in object.__reduce__() if slot name is freed inside
 +  __getattr__.
 +
 +- Issue #24731: Fixed crash on converting objects with special methods
 +  __bytes__, __trunc__, and __float__ returning instances of subclasses of
 +  bytes, int, and float to subclasses of bytes, int, and float correspondingly.
 +
+ - Issue #26171: Fix possible integer overflow and heap corruption in
+   zipimporter.get_data().
+ 
  Library
  -------
  

diff --cc Modules/zipimport.c
Simple merge