diff options
| author | Eric Snow <ericsnowcurrently@gmail.com> | 2017-09-04 23:54:09 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-04 23:54:09 (GMT) |
| commit | 86b7afdfeee77993fe896a2aa13b3f4f95973f16 (patch) | |
| tree | a37fbb7233319c671e4787bff683629148cab971 /Objects/moduleobject.c | |
| parent | f5ea83f4864232fecc042ff0d1c2401807b19280 (diff) | |
| download | cpython-86b7afdfeee77993fe896a2aa13b3f4f95973f16.zip cpython-86b7afdfeee77993fe896a2aa13b3f4f95973f16.tar.gz cpython-86b7afdfeee77993fe896a2aa13b3f4f95973f16.tar.bz2 | |
bpo-28411: Remove "modules" field from Py_InterpreterState. (#1638)
sys.modules is the one true source.
Diffstat (limited to 'Objects/moduleobject.c')
| -rw-r--r-- | Objects/moduleobject.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c index 02a8cf0..89afe29 100644 --- a/Objects/moduleobject.c +++ b/Objects/moduleobject.c @@ -161,11 +161,17 @@ _add_methods_to_object(PyObject *module, PyObject *name, PyMethodDef *functions) PyObject * PyModule_Create2(struct PyModuleDef* module, int module_api_version) { + if (!_PyImport_IsInitialized(PyThreadState_GET()->interp)) + Py_FatalError("Python import machinery not initialized"); + return _PyModule_CreateInitialized(module, module_api_version); +} + +PyObject * +_PyModule_CreateInitialized(struct PyModuleDef* module, int module_api_version) +{ const char* name; PyModuleObject *m; - PyInterpreterState *interp = PyThreadState_Get()->interp; - if (interp->modules == NULL) - Py_FatalError("Python import machinery not initialized"); + if (!PyModuleDef_Init(module)) return NULL; name = module->m_name; |