changeset:   96451:959e998aa167
parent:      96449:ff1938d12240
parent:      96450:5a354de919aa
user:        Benjamin Peterson <benjamin@python.org>
date:        Mon Jun 01 10:14:35 2015 -0500
files:       Misc/NEWS
description:
merge 3.5 (#24345)


diff -r ff1938d12240 -r 959e998aa167 Include/typeslots.h
--- a/Include/typeslots.h	Mon Jun 01 09:47:24 2015 +0300
+++ b/Include/typeslots.h	Mon Jun 01 10:14:35 2015 -0500
@@ -79,3 +79,4 @@
 #define Py_am_await 77
 #define Py_am_aiter 78
 #define Py_am_anext 79
+#define Py_tp_finalize 80
diff -r ff1938d12240 -r 959e998aa167 Misc/NEWS
--- a/Misc/NEWS	Mon Jun 01 09:47:24 2015 +0300
+++ b/Misc/NEWS	Mon Jun 01 10:14:35 2015 -0500
@@ -22,6 +22,8 @@
 Core and Builtins
 -----------------
 
+- Issue #24345: Add Py_tp_finalize slot for the stable ABI.
+
 Library
 -------
 
diff -r ff1938d12240 -r 959e998aa167 Objects/typeslots.inc
--- a/Objects/typeslots.inc	Mon Jun 01 09:47:24 2015 +0300
+++ b/Objects/typeslots.inc	Mon Jun 01 10:14:35 2015 -0500
@@ -78,3 +78,4 @@
 offsetof(PyHeapTypeObject, as_async.am_await),
 offsetof(PyHeapTypeObject, as_async.am_aiter),
 offsetof(PyHeapTypeObject, as_async.am_anext),
+offsetof(PyHeapTypeObject, ht_type.tp_finalize),