summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-06-01 15:14:35 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-06-01 15:14:35 (GMT)
commitcae0658f09b1bc53f6411b5b27d36cebfd8c6c9d (patch)
tree31c4a8bb1c161b3abd100cabbb900f0c2f3c9e79 /Objects
parent5b8b85390081faa91032952336f15794f1651b54 (diff)
parent0969a9f8abcf98bb43ea77b1dd050426adcfb4f7 (diff)
downloadcpython-cae0658f09b1bc53f6411b5b27d36cebfd8c6c9d.zip
cpython-cae0658f09b1bc53f6411b5b27d36cebfd8c6c9d.tar.gz
cpython-cae0658f09b1bc53f6411b5b27d36cebfd8c6c9d.tar.bz2
merge 3.5 (#24345)
Diffstat (limited to 'Objects')
-rw-r--r--Objects/typeslots.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/Objects/typeslots.inc b/Objects/typeslots.inc
index bcbe0af..dc750cc 100644
--- a/Objects/typeslots.inc
+++ b/Objects/typeslots.inc
@@ -78,3 +78,4 @@ offsetof(PyHeapTypeObject, as_number.nb_inplace_matrix_multiply),
offsetof(PyHeapTypeObject, as_async.am_await),
offsetof(PyHeapTypeObject, as_async.am_aiter),
offsetof(PyHeapTypeObject, as_async.am_anext),
+offsetof(PyHeapTypeObject, ht_type.tp_finalize),