forked from bartvdbraak/blender
Cleanup: use PyImport_GetModuleDict
Replace direct access using PyThreadState_GET
This commit is contained in:
parent
c062d360ca
commit
44f719b632
@ -196,7 +196,7 @@ PyObject *BPyInit_bmesh(void)
|
|||||||
{
|
{
|
||||||
PyObject *mod;
|
PyObject *mod;
|
||||||
PyObject *submodule;
|
PyObject *submodule;
|
||||||
PyObject *sys_modules = PyThreadState_GET()->interp->modules;
|
PyObject *sys_modules = PyImport_GetModuleDict();
|
||||||
|
|
||||||
BPy_BM_init_types();
|
BPy_BM_init_types();
|
||||||
BPy_BM_init_types_select();
|
BPy_BM_init_types_select();
|
||||||
|
@ -1795,7 +1795,7 @@ PyObject *BPyInit_idprop(void)
|
|||||||
{
|
{
|
||||||
PyObject *mod;
|
PyObject *mod;
|
||||||
PyObject *submodule;
|
PyObject *submodule;
|
||||||
PyObject *sys_modules = PyThreadState_GET()->interp->modules;
|
PyObject *sys_modules = PyImport_GetModuleDict();
|
||||||
|
|
||||||
mod = PyModule_Create(&IDProp_module_def);
|
mod = PyModule_Create(&IDProp_module_def);
|
||||||
|
|
||||||
|
@ -537,7 +537,7 @@ static bool python_script_exec(
|
|||||||
|
|
||||||
if (py_dict) {
|
if (py_dict) {
|
||||||
#ifdef PYMODULE_CLEAR_WORKAROUND
|
#ifdef PYMODULE_CLEAR_WORKAROUND
|
||||||
PyModuleObject *mmod = (PyModuleObject *)PyDict_GetItemString(PyThreadState_GET()->interp->modules, "__main__");
|
PyModuleObject *mmod = (PyModuleObject *)PyDict_GetItemString(PyImport_GetModuleDict(), "__main__");
|
||||||
PyObject *dict_back = mmod->md_dict;
|
PyObject *dict_back = mmod->md_dict;
|
||||||
/* freeing the module will clear the namespace,
|
/* freeing the module will clear the namespace,
|
||||||
* gives problems running classes defined in this namespace being used later. */
|
* gives problems running classes defined in this namespace being used later. */
|
||||||
|
@ -326,7 +326,7 @@ PyObject *GPU_initPython(void)
|
|||||||
{
|
{
|
||||||
PyObject *module;
|
PyObject *module;
|
||||||
PyObject *submodule;
|
PyObject *submodule;
|
||||||
PyObject *sys_modules = PyThreadState_GET()->interp->modules;
|
PyObject *sys_modules = PyImport_GetModuleDict();
|
||||||
|
|
||||||
module = PyInit_gpu();
|
module = PyInit_gpu();
|
||||||
|
|
||||||
@ -337,6 +337,6 @@ PyObject *GPU_initPython(void)
|
|||||||
PyDict_SetItem(sys_modules, PyModule_GetNameObject(submodule), submodule);
|
PyDict_SetItem(sys_modules, PyModule_GetNameObject(submodule), submodule);
|
||||||
Py_INCREF(submodule);
|
Py_INCREF(submodule);
|
||||||
|
|
||||||
PyDict_SetItem(PyImport_GetModuleDict(), PyModule_GetNameObject(module), module);
|
PyDict_SetItem(sys_modules, PyModule_GetNameObject(module), module);
|
||||||
return module;
|
return module;
|
||||||
}
|
}
|
||||||
|
@ -615,7 +615,7 @@ PyMODINIT_FUNC PyInit_mathutils(void)
|
|||||||
{
|
{
|
||||||
PyObject *mod;
|
PyObject *mod;
|
||||||
PyObject *submodule;
|
PyObject *submodule;
|
||||||
PyObject *sys_modules = PyThreadState_GET()->interp->modules;
|
PyObject *sys_modules = PyImport_GetModuleDict();
|
||||||
|
|
||||||
if (PyType_Ready(&vector_Type) < 0)
|
if (PyType_Ready(&vector_Type) < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -845,6 +845,7 @@ static struct PyModuleDef M_Noise_module_def = {
|
|||||||
/*----------------------------MODULE INIT-------------------------*/
|
/*----------------------------MODULE INIT-------------------------*/
|
||||||
PyMODINIT_FUNC PyInit_mathutils_noise(void)
|
PyMODINIT_FUNC PyInit_mathutils_noise(void)
|
||||||
{
|
{
|
||||||
|
PyObject *sys_modules = PyImport_GetModuleDict();
|
||||||
PyObject *submodule = PyModule_Create(&M_Noise_module_def);
|
PyObject *submodule = PyModule_Create(&M_Noise_module_def);
|
||||||
PyObject *item_types, *item_metrics;
|
PyObject *item_types, *item_metrics;
|
||||||
|
|
||||||
@ -852,11 +853,11 @@ PyMODINIT_FUNC PyInit_mathutils_noise(void)
|
|||||||
setRndSeed(0);
|
setRndSeed(0);
|
||||||
|
|
||||||
PyModule_AddObject(submodule, "types", (item_types = PyInit_mathutils_noise_types()));
|
PyModule_AddObject(submodule, "types", (item_types = PyInit_mathutils_noise_types()));
|
||||||
PyDict_SetItemString(PyThreadState_GET()->interp->modules, "noise.types", item_types);
|
PyDict_SetItemString(sys_modules, "noise.types", item_types);
|
||||||
Py_INCREF(item_types);
|
Py_INCREF(item_types);
|
||||||
|
|
||||||
PyModule_AddObject(submodule, "distance_metrics", (item_metrics = PyInit_mathutils_noise_metrics()));
|
PyModule_AddObject(submodule, "distance_metrics", (item_metrics = PyInit_mathutils_noise_metrics()));
|
||||||
PyDict_SetItemString(PyThreadState_GET()->interp->modules, "noise.distance_metrics", item_metrics);
|
PyDict_SetItemString(sys_modules, "noise.distance_metrics", item_metrics);
|
||||||
Py_INCREF(item_metrics);
|
Py_INCREF(item_metrics);
|
||||||
|
|
||||||
return submodule;
|
return submodule;
|
||||||
|
@ -2234,7 +2234,7 @@ PyMODINIT_FUNC initBGE(void)
|
|||||||
{
|
{
|
||||||
PyObject *mod;
|
PyObject *mod;
|
||||||
PyObject *submodule;
|
PyObject *submodule;
|
||||||
PyObject *sys_modules = PyThreadState_GET()->interp->modules;
|
PyObject *sys_modules = PyImport_GetModuleDict();
|
||||||
const char *mod_full;
|
const char *mod_full;
|
||||||
|
|
||||||
mod = PyModule_Create(&BGE_module_def);
|
mod = PyModule_Create(&BGE_module_def);
|
||||||
|
Loading…
Reference in New Issue
Block a user