From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 19 Jan 2016 05:18:35 +0000 (-0800)
Subject: merge 3.5 (#25731)
X-Git-Tag: v3.6.0a1~740
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c028492d46e058ceaf81c3ec3c806226bf39b0b;p=thirdparty%2FPython%2Fcpython.git

merge 3.5 (#25731)
---

2c028492d46e058ceaf81c3ec3c806226bf39b0b
diff --cc Misc/NEWS
index f5a2afcbe8da,b6e8fe1b900b..2cf9604453f7
--- a/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