[Bf-blender-cvs] [f325ddb] master: Fix Python fails to execute text-blocks including non-mbcs chars (T35176, D595)
Tamito Kajiyama
noreply at git.blender.org
Mon Jun 16 07:29:35 CEST 2014
Commit: f325ddb0d7f876587f12464fab51810f118ee06d
Author: Tamito Kajiyama
Date: Mon Jun 16 15:24:19 2014 +1000
https://developer.blender.org/rBf325ddb0d7f876587f12464fab51810f118ee06d
Fix Python fails to execute text-blocks including non-mbcs chars (T35176, D595)
===================================================================
M source/blender/python/generic/py_capi_utils.c
===================================================================
diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c
index 33ff63a..c000478 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -543,8 +543,9 @@ PyObject *PyC_DefaultNameSpace(const char *filename)
Py_DECREF(mod_main); /* sys.modules owns now */
PyModule_AddStringConstant(mod_main, "__name__", "__main__");
if (filename) {
- /* __file__ mainly for nice UI'ness */
- PyModule_AddObject(mod_main, "__file__", PyUnicode_DecodeFSDefault(filename));
+ /* __file__ mainly for nice UI'ness
+ * note: this wont map to a real file when executing text-blocks and buttons. */
+ PyModule_AddObject(mod_main, "__file__", PyC_UnicodeFromByte(filename));
}
PyModule_AddObject(mod_main, "__builtins__", interp->builtins);
Py_INCREF(interp->builtins); /* AddObject steals a reference */
More information about the Bf-blender-cvs
mailing list