Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-09-01 18:13:48 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-09-01 18:13:48 +0400
commit39cb1432d8ab7c2263b3e4c5eeada5e25928938d (patch)
treed733b5292fdb36c32f35c771a18f3788a3cdfddb /source/blender/python/generic/IDProp.c
parent81d9a3de4302e0d4722d75d727fbc9e9c626bd9e (diff)
bugfix [#23285] Exporters not available whel using special characters in path name
- ID properties now suopport non utf-8 strings for their values but not their keys. - moved utility functions into py_capi_utils.c from bpy_utils and bpy_rna. - import/export paths have to be printed with repr() or %r, so non utf-8 chars are escaped.
Diffstat (limited to 'source/blender/python/generic/IDProp.c')
-rw-r--r--source/blender/python/generic/IDProp.c41
1 files changed, 40 insertions, 1 deletions
diff --git a/source/blender/python/generic/IDProp.c b/source/blender/python/generic/IDProp.c
index ba563f9fcbf..2a07ab3bc90 100644
--- a/source/blender/python/generic/IDProp.c
+++ b/source/blender/python/generic/IDProp.c
@@ -27,6 +27,15 @@
#include "IDProp.h"
#include "MEM_guardedalloc.h"
+#define USE_STRING_COERCE
+
+#ifdef USE_STRING_COERCE
+#include "py_capi_utils.h"
+#endif
+
+PyObject * PyC_UnicodeFromByte(const char *str);
+const char * PuC_UnicodeAsByte(PyObject *py_str, PyObject **coerce); /* coerce must be NULL */
+
/*** Function to wrap ID properties ***/
PyObject *BPy_Wrap_IDProperty(ID *id, IDProperty *prop, IDProperty *parent);
@@ -46,7 +55,11 @@ PyObject *BPy_IDGroup_WrapData( ID *id, IDProperty *prop )
{
switch ( prop->type ) {
case IDP_STRING:
- return PyUnicode_FromString( prop->data.pointer );
+#ifdef USE_STRING_COERCE
+ return PyC_UnicodeFromByte(prop->data.pointer);
+#else
+ return PyUnicode_FromString(prop->data.pointer);
+#endif
case IDP_INT:
return PyLong_FromLong( (long)prop->data.val );
case IDP_FLOAT:
@@ -105,10 +118,25 @@ int BPy_IDGroup_SetData(BPy_IDProperty *self, IDProperty *prop, PyObject *value)
PyErr_SetString(PyExc_TypeError, "expected a string!");
return -1;
}
+#ifdef USE_STRING_COERCE
+ {
+ int alloc_len;
+ PyObject *value_coerce= NULL;
+ st= (char *)PuC_UnicodeAsByte(value, &value_coerce);
+ alloc_len= strlen(st) + 1;
+
+ st = _PyUnicode_AsString(value);
+ IDP_ResizeArray(prop, alloc_len);
+ memcpy(prop->data.pointer, st, alloc_len);
+ Py_XDECREF(value_coerce);
+ }
+#else
st = _PyUnicode_AsString(value);
IDP_ResizeArray(prop, strlen(st)+1);
strcpy(prop->data.pointer, st);
+#endif
+
return 0;
}
@@ -281,8 +309,15 @@ char *BPy_IDProperty_Map_ValidateAndCreate(char *name, IDProperty *group, PyObje
val.i = (int) PyLong_AsSsize_t(ob);
prop = IDP_New(IDP_INT, val, name);
} else if (PyUnicode_Check(ob)) {
+#ifdef USE_STRING_COERCE
+ PyObject *value_coerce= NULL;
+ val.str = (char *)PuC_UnicodeAsByte(ob, &value_coerce);
+ prop = IDP_New(IDP_STRING, val, name);
+ Py_XDECREF(value_coerce);
+#else
val.str = _PyUnicode_AsString(ob);
prop = IDP_New(IDP_STRING, val, name);
+#endif
} else if (PySequence_Check(ob)) {
PyObject *item;
int i;
@@ -432,7 +467,11 @@ static PyObject *BPy_IDGroup_MapDataToPy(IDProperty *prop)
{
switch (prop->type) {
case IDP_STRING:
+#ifdef USE_STRING_COERCE
+ return PyC_UnicodeFromByte(prop->data.pointer);
+#else
return PyUnicode_FromString(prop->data.pointer);
+#endif
break;
case IDP_FLOAT:
return PyFloat_FromDouble(*((float*)&prop->data.val));