Backport half a patch from the trunk. This inherits tp_is_gc from a

base class.

diff --git a/Misc/NEWS b/Misc/NEWS
index aea9348fcd0a58f604a3700007a6cc5bc84ceedf..8f34aa599ad64e9db7ca61271535ca827538e8b4 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,10 @@ Library
   circular references by using itself as the locator that gets passed
   to the content handler implementation.  [SF bug #535474]
 
+C API
+
+- PyType_Ready() accidentally did not inherit tp_is_gc; now it does.
+
 Windows
 
 - The installer now installs Start menu shortcuts under (the local

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index bc7a189c1d00c498cdc48daf88ff5cd3ef6c21f6..5ec5784c94e3a90d6e731e5e95496740ccce6a3f 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -1980,6 +1980,7 @@ inherit_slots(PyTypeObject *type, PyTypeObject *base)
                COPYSLOT(tp_init);
                COPYSLOT(tp_alloc);
                COPYSLOT(tp_free);
+               COPYSLOT(tp_is_gc);
        }
 }