Merge 3.5

Issue #26154: Add a new private _PyThreadState_UncheckedGet() function.

diff --cc Misc/NEWS
index 82221b4f4df566cacb16fb7dd3a0fc02255ae8dc,4baf757b5f30ed1a0316155c13963e388b81ac18..46464def85f38c05f75c6c904e095562a910a218
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,10 -10,17 +10,17 @@@ Release date: tb
  Core and Builtins
  -----------------
  
 -- Issue #25731: Fix set and deleting __new__ on a class.
+ - 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 #25791: Trying to resolve a relative import without __spec__ or
 +  __package__ defined now raises an ImportWarning
  
 -- Issue #22995: [UPDATE] Comment out the one of the pickleability tests in
 -  _PyObject_GetState() due to regressions observed in Cython-based projects.
 +- Issue #25731: Fix set and deleting __new__ on a class.
  
  - Issue #25961: Disallowed null characters in the type name.
  

diff --cc Objects/dictobject.c
Simple merge

diff --cc Python/pystate.c
Simple merge

diff --cc Python/sysmodule.c
Simple merge