kindred/create
1
1
Fork 0
Code Issues 44 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Extend Py interface of PropertyStringList to accept all sequence types

Browse Source
This commit is contained in:
wmayer
2017-04-23 15:02:48 +02:00
parent 93c445bae4
commit 5ba030d12f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/App/PropertyStandard.cpp
View File

@@ -1604,13 +1604,16 @@ PyObject *PropertyStringList::getPyObject(void)
void PropertyStringList::setPyObject(PyObject *value)
{
if (PyList_Check(value)) {
Py_ssize_t nSize = PyList_Size(value);
if (PyString_Check(value)) {
setValue(PyString_AsString(value));
}
else if (PySequence_Check(value)) {
Py_ssize_t nSize = PySequence_Size(value);
std::vector<std::string> values;
values.resize(nSize);
for (Py_ssize_t i=0; i<nSize;++i) {
PyObject* item = PyList_GetItem(value, i);
PyObject* item = PySequence_GetItem(value, i);
if (PyUnicode_Check(item)) {
PyObject* unicode = PyUnicode_AsUTF8String(item);
values[i] = PyString_AsString(unicode);
@@ -1628,9 +1631,6 @@ void PropertyStringList::setPyObject(PyObject *value)
setValues(values);
}
else if (PyString_Check(value)) {
setValue(PyString_AsString(value));
}
else {
std::string error = std::string("type must be str or list of str, not ");
error += value->ob_type->tp_name;