]> granicus.if.org Git - python/commitdiff
merge 3.5 (#26991)
authorBenjamin Peterson <benjamin@python.org>
Tue, 17 May 2016 05:53:44 +0000 (22:53 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 17 May 2016 05:53:44 +0000 (22:53 -0700)
1  2 
Misc/NEWS
Python/ceval.c

diff --cc Misc/NEWS
index 8dfee3d9e7988286cfeea754e6a8d87ba9629404,97ddbb12f3dd2ae863da5a9ed4ea54067e80a6d9..5f4200c92ee9a9ee8593ab82c838e7fe2dfb655e
+++ b/Misc/NEWS
@@@ -10,8 -10,10 +10,10 @@@ Release date: tb
  Core and Builtins
  -----------------
  
 -- Issue #27039: Fixed bytearray.remove() for values greater than 127.  Patch by
 -  Joe Jevnik.
+ - Issue #26991: Fix possible refleak when creating a function with annotations.
 +- Issue #27039: Fixed bytearray.remove() for values greater than 127.  Based on
 +  patch by Joe Jevnik.
  
  - Issue #23640: int.from_bytes() no longer bypasses constructors for subclasses.
  
diff --cc Python/ceval.c
Simple merge