From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 4 Oct 2016 07:00:35 +0000 (-0700)
Subject: merge 3.6 (#26617)
X-Git-Tag: v3.7.0a1~2310
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b983b8de9db24671db1212e11c254839b965b23e;p=python

merge 3.6 (#26617)
---

b983b8de9db24671db1212e11c254839b965b23e
diff --cc Misc/NEWS
index 5b6ed49bcd,121e567891..0fea54780a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,10 -10,10 +10,12 @@@ What's New in Python 3.7.0 alpha 
  Core and Builtins
  -----------------
  
+ - Issue #26617: Fix crash when GC runs during weakref callbacks.
+ 
  - Issue #27942: String constants now interned recursively in tuples and frozensets.
  
 +- Issue #28289: ImportError.__init__ now resets not specified attributes.
 +
  - Issue #21578: Fixed misleading error message when ImportError called with
    invalid keyword args.