[Bf-blender-cvs] [00afa02] master: PyAPI: remove workaround for Py3.4 bug
Campbell Barton
noreply at git.blender.org
Wed Nov 25 12:02:38 CET 2015
Commit: 00afa0252879cec373e8ee5949b1bf05b194462f
Author: Campbell Barton
Date: Wed Nov 25 21:51:05 2015 +1100
Branches: master
https://developer.blender.org/rB00afa0252879cec373e8ee5949b1bf05b194462f
PyAPI: remove workaround for Py3.4 bug
===================================================================
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 e833dba..60463be 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -533,15 +533,6 @@ const char *PyC_UnicodeAsByte(PyObject *py_str, PyObject **coerce)
if (PyBytes_Check(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))) {
return PyBytes_AS_STRING(*coerce);
}
More information about the Bf-blender-cvs
mailing list