bpo-34572: change _pickle unpickling to use import rather than retrieving from sys.modules (GH-9047) (GH-11921)
Fix C implementation of pickle.loads to use importlib's locking mechanisms, and thereby avoid using partially-loaded modules.
(cherry picked from commit 4371c0a9c0848f7a0947d43f26f234842b41efdf)
Co-authored-by: tjb900 <ozburgess@gmail.com>
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 60ef921..15e15cd 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -6636,13 +6636,13 @@
}
}
- module = PyImport_GetModule(module_name);
+ /*
+ * we don't use PyImport_GetModule here, because it can return partially-
+ * initialised modules, which then cause the getattribute to fail.
+ */
+ module = PyImport_Import(module_name);
if (module == NULL) {
- if (PyErr_Occurred())
- return NULL;
- module = PyImport_Import(module_name);
- if (module == NULL)
- return NULL;
+ return NULL;
}
global = getattribute(module, global_name, self->proto >= 4);
Py_DECREF(module);