Pass PyInterpreterState to _PyImport_GetModuleDict().

Author: ericsnowcurrently

Include/import.h

@@ -39,8 +39,8 @@ PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleObject(
 #endif
 PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void);
 #ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyImport_GetModuleDict(PyThreadState *tstate);
-PyAPI_FUNC(void) _PyImport_EnsureInitialized(PyInterpreterState *interp);
+PyAPI_FUNC(PyObject *) _PyImport_GetModuleDict(PyInterpreterState *);
+PyAPI_FUNC(void) _PyImport_EnsureInitialized(PyInterpreterState *);
 #endif
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
 PyAPI_FUNC(PyObject *) PyImport_AddModuleObject(

Python/import.c

@@ -288,20 +288,18 @@ _PyImport_Fini(void)
 /* Helper for sys */
 
 PyObject *
-_PyImport_GetModuleDict(PyThreadState *tstate)
+_PyImport_GetModuleDict(PyInterpreterState *interp)
 {
-    PyInterpreterState *interp = tstate->interp;
     if (interp->modules == NULL)
         Py_FatalError("PyImport_GetModuleDict: no module dictionary!");
     return interp->modules;
 
     /* We aren't ready to do this yet.
-    if (tstate->interp->sysdict == NULL)
-        Py_FatalError("_PyImport_GetModuleDict: no sys module!");
+    if (interp->sysdict == NULL)
+        Py_FatalError("PyImport_GetModuleDict: no sys module!");
 
     _Py_IDENTIFIER(modules);
-    PyObject *modules = _PyDict_GetItemId(tstate->interp->sysdict,
-                                          &PyId_modules);
+    PyObject *modules = _PyDict_GetItemId(interp->sysdict, &PyId_modules);
     if (modules == NULL)
         Py_FatalError("lost sys.modules");
     return modules;
@@ -311,7 +309,7 @@ _PyImport_GetModuleDict(PyThreadState *tstate)
 PyObject *
 PyImport_GetModuleDict(void)
 {
-    return _PyImport_GetModuleDict(PyThreadState_GET());
+    return _PyImport_GetModuleDict(PyThreadState_GET()->interp);
 }
 
 /* In some corner cases it is important to be sure that the import