diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_pickle.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/_pickle.c b/Modules/_pickle.c index 58cd09c..2b97294 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -6636,13 +6636,13 @@ _pickle_Unpickler_find_class_impl(UnpicklerObject *self, } } - 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); |