merge 3.5 (#25731)

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

diff --cc Misc/NEWS
index f5a2afcbe8daa3b8a9b3ca110d692d74bf023478,b6e8fe1b900ba7f05d64f09b71ed14be2f0558b7..2cf9604453f74ec6aff186051a162ce1401f5cd4
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,9 -10,11 +10,11 @@@ Release date: tb
  Core and Builtins
  -----------------
  
 -- Issue #25731: Fix set and deleting __new__ on a class.
 +- 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.
  
  - Issue #25973: Fix segfault when an invalid nonlocal statement binds a name

diff --cc Objects/typeobject.c
Simple merge