diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-03 05:48:30 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-03 05:48:51 +0300 |
commit | 88a893a83876bd983291881dbea8855600610e2b (patch) | |
tree | d47af71eb1069f6e3e870f54ca5312af2536deb5 /source/blender/python/generic | |
parent | 0c389862c4fff3fb9eca9027e300774ce1c3eb7e (diff) | |
parent | 7ff1750218bf3c2ef4c57f9ea4a12b738f4b7264 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python/generic')
-rw-r--r-- | source/blender/python/generic/py_capi_utils.c | 47 | ||||
-rw-r--r-- | source/blender/python/generic/py_capi_utils.h | 11 |
2 files changed, 41 insertions, 17 deletions
diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c index 327f325f02c..46f80bf79f9 100644 --- a/source/blender/python/generic/py_capi_utils.c +++ b/source/blender/python/generic/py_capi_utils.c @@ -716,6 +716,26 @@ PyObject *PyC_DefaultNameSpace(const char *filename) return PyModule_GetDict(mod_main); } +bool PyC_NameSpace_ImportArray(PyObject *py_dict, const char *imports[]) +{ + for (int i = 0; imports[i]; i++) { + PyObject *name = PyUnicode_FromString(imports[i]); + PyObject *mod = PyImport_ImportModuleLevelObject(name, NULL, NULL, 0, 0); + bool ok = false; + if (mod) { + PyDict_SetItem(py_dict, name, mod); + ok = true; + Py_DECREF(mod); + } + Py_DECREF(name); + + if (!ok) { + return false; + } + } + return true; +} + /* restore MUST be called after this */ void PyC_MainModule_Backup(PyObject **main_mod) { @@ -1076,7 +1096,7 @@ PyObject *PyC_FlagSet_FromBitfield(PyC_FlagSet *items, int flag) * * \note it is caller's responsibility to acquire & release GIL! */ -bool PyC_RunString_AsNumber(const char *expr, const char *filename, double *r_value) +bool PyC_RunString_AsNumber(const char *imports[], const char *expr, const char *filename, double *r_value) { PyObject *py_dict, *mod, *retval; bool ok = true; @@ -1096,9 +1116,10 @@ bool PyC_RunString_AsNumber(const char *expr, const char *filename, double *r_va PyErr_Clear(); } - retval = PyRun_String(expr, Py_eval_input, py_dict, py_dict); - - if (retval == NULL) { + if (imports && (!PyC_NameSpace_ImportArray(py_dict, imports))) { + ok = false; + } + else if ((retval = PyRun_String(expr, Py_eval_input, py_dict, py_dict)) == NULL) { ok = false; } else { @@ -1140,7 +1161,7 @@ bool PyC_RunString_AsNumber(const char *expr, const char *filename, double *r_va return ok; } -bool PyC_RunString_AsIntPtr(const char *expr, const char *filename, intptr_t *r_value) +bool PyC_RunString_AsIntPtr(const char *imports[], const char *expr, const char *filename, intptr_t *r_value) { PyObject *py_dict, *retval; bool ok = true; @@ -1150,9 +1171,10 @@ bool PyC_RunString_AsIntPtr(const char *expr, const char *filename, intptr_t *r_ py_dict = PyC_DefaultNameSpace(filename); - retval = PyRun_String(expr, Py_eval_input, py_dict, py_dict); - - if (retval == NULL) { + if (imports && (!PyC_NameSpace_ImportArray(py_dict, imports))) { + ok = false; + } + else if ((retval = PyRun_String(expr, Py_eval_input, py_dict, py_dict)) == NULL) { ok = false; } else { @@ -1174,7 +1196,7 @@ bool PyC_RunString_AsIntPtr(const char *expr, const char *filename, intptr_t *r_ return ok; } -bool PyC_RunString_AsString(const char *expr, const char *filename, char **r_value) +bool PyC_RunString_AsString(const char *imports[], const char *expr, const char *filename, char **r_value) { PyObject *py_dict, *retval; bool ok = true; @@ -1184,9 +1206,10 @@ bool PyC_RunString_AsString(const char *expr, const char *filename, char **r_val py_dict = PyC_DefaultNameSpace(filename); - retval = PyRun_String(expr, Py_eval_input, py_dict, py_dict); - - if (retval == NULL) { + if (imports && (!PyC_NameSpace_ImportArray(py_dict, imports))) { + ok = false; + } + else if ((retval = PyRun_String(expr, Py_eval_input, py_dict, py_dict)) == NULL) { ok = false; } else { diff --git a/source/blender/python/generic/py_capi_utils.h b/source/blender/python/generic/py_capi_utils.h index b962f40c180..da127e213b7 100644 --- a/source/blender/python/generic/py_capi_utils.h +++ b/source/blender/python/generic/py_capi_utils.h @@ -77,8 +77,9 @@ const char * PyC_UnicodeAsByte(PyObject *py_str, PyObject **coerce); /* coerc const char * PyC_UnicodeAsByteAndSize(PyObject *py_str, Py_ssize_t *size, PyObject **coerce); /* name namespace function for bpy */ -PyObject * PyC_DefaultNameSpace(const char *filename); -void PyC_RunQuicky(const char *filepath, int n, ...); +PyObject *PyC_DefaultNameSpace(const char *filename); +void PyC_RunQuicky(const char *filepath, int n, ...); +bool PyC_NameSpace_ImportArray(PyObject *py_dict, const char *imports[]); void PyC_MainModule_Backup(PyObject **main_mod); void PyC_MainModule_Restore(PyObject *main_mod); @@ -101,9 +102,9 @@ int PyC_FlagSet_ValueFromID(PyC_FlagSet *item, const char *identifier, int int PyC_FlagSet_ToBitfield(PyC_FlagSet *items, PyObject *value, int *r_value, const char *error_prefix); PyObject *PyC_FlagSet_FromBitfield(PyC_FlagSet *items, int flag); -bool PyC_RunString_AsNumber(const char *expr, const char *filename, double *r_value); -bool PyC_RunString_AsIntPtr(const char *expr, const char *filename, intptr_t *r_value); -bool PyC_RunString_AsString(const char *expr, const char *filename, char **r_value); +bool PyC_RunString_AsNumber(const char **imports, const char *expr, const char *filename, double *r_value); +bool PyC_RunString_AsIntPtr(const char **imports, const char *expr, const char *filename, intptr_t *r_value); +bool PyC_RunString_AsString(const char **imports, const char *expr, const char *filename, char **r_value); int PyC_ParseBool(PyObject *o, void *p); |