bpo-31404: Revert "remove modules from Py_InterpreterState (#1638)" (… · python/cpython@93c92f7 (original) (raw)
`@@ -38,25 +38,11 @@ PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleObject(
`
38
38
` );
`
39
39
`#endif
`
40
40
`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
`
52
41
`#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
`
53
42
`PyAPI_FUNC(PyObject *) PyImport_AddModuleObject(
`
54
43
`PyObject *name
`
55
44
` );
`
56
45
`#endif
`
57
``
`-
#ifndef Py_LIMITED_API
`
58
``
`-
PyAPI_FUNC(PyObject *) _PyImport_AddModuleObject(PyObject *, PyObject *);
`
59
``
`-
#endif
`
60
46
`PyAPI_FUNC(PyObject *) PyImport_AddModule(
`
61
47
`const char name / UTF-8 encoded string */
`
62
48
` );
`
`@@ -106,19 +92,14 @@ PyAPI_FUNC(int) _PyImport_ReleaseLock(void);
`
106
92
`PyAPI_FUNC(void) _PyImport_ReInitLock(void);
`
107
93
``
108
94
`PyAPI_FUNC(PyObject *) _PyImport_FindBuiltin(
`
109
``
`-
const char name, / UTF-8 encoded string */
`
110
``
`-
PyObject *modules
`
``
95
`+
const char name / UTF-8 encoded string */
`
111
96
` );
`
112
97
`PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObject(PyObject *, PyObject *);
`
113
``
`-
PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObjectEx(PyObject *, PyObject *,
`
114
``
`-
PyObject *);
`
115
98
`PyAPI_FUNC(int) _PyImport_FixupBuiltin(
`
116
99
`PyObject *mod,
`
117
``
`-
const char name, / UTF-8 encoded string */
`
118
``
`-
PyObject *modules
`
``
100
`+
const char name / UTF-8 encoded string */
`
119
101
` );
`
120
``
`-
PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *,
`
121
``
`-
PyObject *, PyObject *);
`
``
102
`+
PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *);
`
122
103
``
123
104
`struct _inittab {
`
124
105
`const char name; / ASCII encoded string */
`