merge 3.5

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

diff --cc Misc/NEWS
index ce051d51a25559c8eaeb3e2fc279e93f7b1b68e7,1c479ce88fa9e779c421dfd7a097da432911b6da..d2d157ff05cc83cdf68a07574a4984ffc65127ef
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -191,20 -80,8 +191,21 @@@ Core and Builtin
    (``int``) and ``f2()`` returns ``1.0`` (``int``), even if ``1`` and ``1.0``
    are equal.
  
- - Issue #25731: Fix set and deleting __new__ on a class.
 +- Issue #26107: The format of the ``co_lnotab`` attribute of code objects
 +  changes to support negative line number delta.
 +
 +- 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: If __package__ != __spec__.parent or if neither __package__ or
 +  __spec__ are defined then ImportWarning is raised.
 +
+ - 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.
  

diff --cc Objects/typeobject.c
Simple merge