[Python-checkins] cpython (merge 3.5 -> default): merge 3.5 (#24345)

[benjamin.peterson]

https://hg.python.org/cpython/rev/959e998aa167
changeset:   96451:959e998aa167
parent:      96449:ff1938d12240
parent:      96450:5a354de919aa
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jun 01 10:14:35 2015 -0500
summary:
  merge 3.5 (#24345)

files:
  Include/typeslots.h   |  1 +
  Misc/NEWS             |  2 ++
  Objects/typeslots.inc |  1 +
  3 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/Include/typeslots.h b/Include/typeslots.h
--- a/Include/typeslots.h
+++ b/Include/typeslots.h
@@ -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 --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,8 @@
 Core and Builtins
 -----------------
 
+- Issue #24345: Add Py_tp_finalize slot for the stable ABI.
+
 Library
 -------
 
diff --git a/Objects/typeslots.inc b/Objects/typeslots.inc
--- a/Objects/typeslots.inc
+++ b/Objects/typeslots.inc
@@ -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),

-- 
Repository URL: https://hg.python.org/cpython