bpo-21222: Fix improperly merged change so that final hooks are called before types are cleared (GH-21304)

zooba · web-flow · commit 941117aaa32b · 2020-07-03T23:34:46.000+01:00
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -1301,15 +1301,15 @@ finalize_interp_clear(PyThreadState *tstate)
         _PyGC_CollectNoFail();
     }
 
-    finalize_interp_types(tstate, is_main_interp);
-
     /* Clear all loghooks */
     /* Both _PySys_Audit function and users still need PyObject, such as tuple.
        Call _PySys_ClearAuditHooks when PyObject available. */
     if (is_main_interp) {
         _PySys_ClearAuditHooks(tstate);
     }
 
+    finalize_interp_types(tstate, is_main_interp);
+
     if (is_main_interp) {
         /* XXX Still allocated:
            - various static ad-hoc pointers to interned strings
