bpo-28411: Remove "modules" field from Py_InterpreterState. (#1638) · python/cpython@86b7afd

@@ -38,11 +38,25 @@ PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleObject(

3838

);

3939

#endif

4040

PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void);

41+

#ifndef Py_LIMITED_API

42+

PyAPI_FUNC(int) _PyImport_IsInitialized(PyInterpreterState *);

43+

#endif

44+

PyAPI_FUNC(PyObject *) PyImport_GetModule(PyObject *name);

45+

#ifndef Py_LIMITED_API

46+

PyAPI_FUNC(PyObject *) _PyImport_GetModule(PyObject *name);

47+

PyAPI_FUNC(PyObject *) _PyImport_GetModuleWithError(PyObject *name);

48+

PyAPI_FUNC(PyObject *) _PyImport_GetModuleId(struct _Py_Identifier *name);

49+

PyAPI_FUNC(int) _PyImport_SetModule(PyObject *name, PyObject *module);

50+

PyAPI_FUNC(int) _PyImport_SetModuleString(const char *name, PyObject* module);

51+

#endif

4152

#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000

4253

PyAPI_FUNC(PyObject *) PyImport_AddModuleObject(

4354

PyObject *name

4455

);

4556

#endif

57+

#ifndef Py_LIMITED_API

58+

PyAPI_FUNC(PyObject *) _PyImport_AddModuleObject(PyObject *, PyObject *);

59+

#endif

4660

PyAPI_FUNC(PyObject *) PyImport_AddModule(

4761

const char *name /* UTF-8 encoded string */

4862

);

@@ -97,14 +111,19 @@ PyAPI_FUNC(int) _PyImport_ReleaseLock(void);

97111

PyAPI_FUNC(void) _PyImport_ReInitLock(void);

9811299113

PyAPI_FUNC(PyObject *) _PyImport_FindBuiltin(

100-

const char *name /* UTF-8 encoded string */

114+

const char *name, /* UTF-8 encoded string */

115+

PyObject *modules

101116

);

102117

PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObject(PyObject *, PyObject *);

118+

PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObjectEx(PyObject *, PyObject *,

119+

PyObject *);

103120

PyAPI_FUNC(int) _PyImport_FixupBuiltin(

104121

PyObject *mod,

105-

const char *name /* UTF-8 encoded string */

122+

const char *name, /* UTF-8 encoded string */

123+

PyObject *modules

106124

);

107-

PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *);

125+

PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *,

126+

PyObject *, PyObject *);

108127109128

struct _inittab {

110129

const char *name; /* ASCII encoded string */