archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix [#31856] movieclips.load(filepath=None) or value crash Blender

Browse Source 
workaround for python bug/inconsistency
This commit is contained in:
Campbell Barton
2012-09-04 05:36:07 +00:00
parent 914d389713
commit 3804b2d2ba
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/python/generic/py_capi_utils.c
View File

@@ -402,6 +402,15 @@ const char *PyC_UnicodeAsByte(PyObject *py_str, PyObject **coerce)
if (PyBytes_Check(py_str)) { if (PyBytes_Check(py_str)) {
return PyBytes_AS_STRING(py_str); return PyBytes_AS_STRING(py_str);
} }
#ifdef WIN32
/* bug [#31856] oddly enough, Python3.2 --> 3.3 on Windows will throw an
* exception here this needs to be fixed in python:
* see: bugs.python.org/issue15859 */
else if (!PyUnicode_Check(py_str)) {
PyErr_BadArgument();
return NULL;
}
#endif
else if ((*coerce = PyUnicode_EncodeFSDefault(py_str))) { else if ((*coerce = PyUnicode_EncodeFSDefault(py_str))) {
return PyBytes_AS_STRING(*coerce); return PyBytes_AS_STRING(*coerce);
} }