diff options
| author | Eric Snow <ericsnowcurrently@gmail.com> | 2017-09-15 22:35:20 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 22:35:20 (GMT) |
| commit | 3f9eee6eb4b25fe1926eaa5f00e02344b126f54d (patch) | |
| tree | c749747e0b4ce492d05c34ad5578b81128be1156 /Include | |
| parent | e82c034496512139e9ea3f68ceda86c04bc7baab (diff) | |
| download | cpython-3f9eee6eb4b25fe1926eaa5f00e02344b126f54d.zip cpython-3f9eee6eb4b25fe1926eaa5f00e02344b126f54d.tar.gz cpython-3f9eee6eb4b25fe1926eaa5f00e02344b126f54d.tar.bz2 | |
bpo-28411: Support other mappings in PyInterpreterState.modules. (#3593)
The concrete PyDict_* API is used to interact with PyInterpreterState.modules in a number of places. This isn't compatible with all dict subclasses, nor with other Mapping implementations. This patch switches the concrete API usage to the corresponding abstract API calls.
We also add a PyImport_GetModule() function (and some other helpers) to reduce a bunch of code duplication.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/import.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Include/import.h b/Include/import.h index 95c52b0..c30f3ea 100644 --- a/Include/import.h +++ b/Include/import.h @@ -38,8 +38,14 @@ PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleObject( ); #endif PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void); +PyAPI_FUNC(PyObject *) PyImport_GetModule(PyObject *name); #ifndef Py_LIMITED_API PyAPI_FUNC(int) _PyImport_IsInitialized(PyInterpreterState *); +PyAPI_FUNC(PyObject *) _PyImport_GetModuleId(struct _Py_Identifier *name); +PyAPI_FUNC(PyObject *) _PyImport_AddModuleObject(PyObject *name, + PyObject *modules); +PyAPI_FUNC(int) _PyImport_SetModule(PyObject *name, PyObject *module); +PyAPI_FUNC(int) _PyImport_SetModuleString(const char *name, PyObject* module); #endif #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 PyAPI_FUNC(PyObject *) PyImport_AddModuleObject( |