diff options
Diffstat (limited to 'source/blender/python')
-rw-r--r-- | source/blender/python/intern/bpy_interface.c | 12 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 6 |
2 files changed, 6 insertions, 12 deletions
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index a73e4034ca6..a69ce068aec 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -262,16 +262,8 @@ void BPY_python_start(int argc, const char **argv) * blender is utf-8 too - campbell */ Py_SetStandardStreamEncoding("utf-8", "surrogateescape"); - /* Update, Py3.3 resolves attempting to parse non-existing header */ -# if 0 - /* Python 3.2 now looks for '2.xx/python/include/python3.2d/pyconfig.h' to - * parse from the 'sysconfig' module which is used by 'site', - * so for now disable site. alternatively we could copy the file. */ - if (py_path_bundle) { - Py_NoSiteFlag = 1; - } -# endif - + /* Suppress error messages when calculating the module search path. + * While harmless, it's noisy. */ Py_FrozenFlag = 1; Py_Initialize(); diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 6bc7676973c..4c14f8ca8d3 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -8684,7 +8684,8 @@ static PyObject *pyrna_register_class(PyObject *UNUSED(self), PyObject *py_class return NULL; } - /* Call classed register method. */ + /* Call classed register method. + * Note that zero falls through, no attribute, no error. */ switch (_PyObject_LookupAttr(py_class, bpy_intern_str_register, &py_cls_meth)) { case 1: { PyObject *ret = PyObject_CallObject(py_cls_meth, NULL); @@ -8791,7 +8792,8 @@ static PyObject *pyrna_unregister_class(PyObject *UNUSED(self), PyObject *py_cla return NULL; } - /* Call classed unregister method. */ + /* Call classed unregister method. + * Note that zero falls through, no attribute, no error. */ switch (_PyObject_LookupAttr(py_class, bpy_intern_str_unregister, &py_cls_meth)) { case 1: { PyObject *ret = PyObject_CallObject(py_cls_meth, NULL); |