Undo the last chunk of the previous patch, putting back a useful

assert into PyType_Ready(): now that we're not clearing tp_dict, we
can assert that it's non-NULL again.

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 8b51a53fb4849fc9733ed07d1a799f1b1c40afbc..49c7d5250fac10a647107fe8a04f71c0dcf4bf84 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2175,8 +2175,10 @@ PyType_Ready(PyTypeObject *type)
        PyTypeObject *base;
        int i, n;
 
-       if (type->tp_flags & Py_TPFLAGS_READY)
+       if (type->tp_flags & Py_TPFLAGS_READY) {
+               assert(type->tp_dict != NULL);
                return 0;
+       }
        assert((type->tp_flags & Py_TPFLAGS_READYING) == 0);
 
        type->tp_flags |= Py_TPFLAGS_READYING;