_PyImport_EnsureInitialized() -> _PyImport_IsInitialized()

Author: ericsnowcurrently

Include/import.h

@@ -39,7 +39,7 @@ PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleObject(
 #endif
 PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void);
 #ifndef Py_LIMITED_API
-PyAPI_FUNC(void) _PyImport_EnsureInitialized(PyInterpreterState *);
+PyAPI_FUNC(int) _PyImport_IsInitialized(PyInterpreterState *);
 #endif
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
 PyAPI_FUNC(PyObject *) PyImport_AddModuleObject(

Objects/moduleobject.c

@@ -162,7 +162,8 @@ _add_methods_to_object(PyObject *module, PyObject *name, PyMethodDef *functions)
 PyObject *
 PyModule_Create2(struct PyModuleDef* module, int module_api_version)
 {
-    _PyImport_EnsureInitialized(PyThreadState_GET()->interp);
+    if (!_PyImport_IsInitialized(PyThreadState_GET()->interp))
+        Py_FatalError("Python import machinery not initialized");
     return _PyModule_CreateInitialized(module, module_api_version);
 }
 

Python/import.c

@@ -312,23 +312,20 @@ PyImport_GetModuleDict(void)
    machinery has been initialized (or not cleaned up yet).  For
    example, see issue #4236 and PyModule_Create2(). */
 
-void
-_PyImport_EnsureInitialized(PyInterpreterState *interp)
+int
+_PyImport_IsInitialized(PyInterpreterState *interp)
 {
     if (interp->modules == NULL)
-        goto notinitialized;
+        return 0;
     /* We aren't ready to do this yet.
     if (interp->sysdict == NULL)
-        goto notinitialized;
+        return 0;
     _Py_IDENTIFIER(modules);
     PyObject *modules = _PyDict_GetItemId(interp->sysdict, &PyId_modules);
     if (modules == NULL)
-        goto notinitialized;
+        return 0;
     */
-    return;
-
-notinitialized:
-    Py_FatalError("Python import machinery not initialized");
+    return 1;
 }