Remove module dict swapping

colesbury · colesbury · commit 588255e43baf · 2024-04-26T17:12:54.000Z
diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py
@@ -296,8 +296,9 @@ def __init__(self, executor):
         # if there is no pending work item.
         def weakref_cb(_,
                        thread_wakeup=self.thread_wakeup,
-                       shutdown_lock=self.shutdown_lock):
-            mp.util.debug('Executor collected: triggering callback for'
+                       shutdown_lock=self.shutdown_lock,
+                       mp_util_debug=mp.util.debug):
+            mp_util_debug('Executor collected: triggering callback for'
                           ' QueueManager wakeup')
             with shutdown_lock:
                 thread_wakeup.wakeup()
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -1491,23 +1491,6 @@ finalize_modules_delete_special(PyThreadState *tstate, int verbose)
     }
 }
 
-static void
-swap_module_dict(PyModuleObject *mod)
-{
-    if (_Py_IsImmortal(mod->md_dict)) {
-        // gh-117783: Immortalizing module dicts can cause some finalizers to
-        // run much later than typical leading to attribute errors due to
-        // partially cleared modules. To avoid this, we copy the module dict
-        // if it was immortalized.
-        PyObject *copy = PyDict_Copy(mod->md_dict);
-        if (copy == NULL) {
-            PyErr_FormatUnraisable("Exception ignored on removing modules");
-            return;
-        }
-        Py_SETREF(mod->md_dict, copy);
-    }
-}
-
 static PyObject*
 finalize_remove_modules(PyObject *modules, int verbose)
 {
@@ -1537,7 +1520,6 @@ finalize_remove_modules(PyObject *modules, int verbose)
             if (verbose && PyUnicode_Check(name)) { \
                 PySys_FormatStderr("# cleanup[2] removing %U\n", name); \
             } \
-            swap_module_dict((PyModuleObject *)mod); \
             STORE_MODULE_WEAKREF(name, mod); \
             if (PyObject_SetItem(modules, name, Py_None) < 0) { \
                 PyErr_FormatUnraisable("Exception ignored on removing modules"); \
