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

App: Set PropertyMap using Python objects with mapping protocol

Browse Source
This commit is contained in:
marioalexis
2025-01-05 17:46:23 -03:00
committed by Yorik van Havre
parent 3a24e87492
commit 90ed7ea793
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/App/PropertyStandard.cpp
View File

@@ -1970,17 +1970,14 @@ PyObject* PropertyMap::getPyObject()
void PropertyMap::setPyObject(PyObject* value)
{
if (PyDict_Check(value)) {
if (PyMapping_Check(value)) {
std::map<std::string, std::string> values;
// get key and item list
PyObject* keyList = PyDict_Keys(value);
PyObject* itemList = PyDict_Values(value);
PyObject* keyList = PyMapping_Keys(value);
PyObject* itemList = PyMapping_Values(value);
Py_ssize_t nSize = PyList_Size(keyList);
for (Py_ssize_t i = 0; i < nSize; ++i) {
// check on the key:
std::string keyStr;
PyObject* key = PyList_GetItem(keyList, i);
@@ -1988,7 +1985,7 @@ void PropertyMap::setPyObject(PyObject* value)
keyStr = PyUnicode_AsUTF8(key);
}
else {
std::string error("type of the key need to be unicode or string, not");
std::string error("type of the key need to be string, not ");
error += key->ob_type->tp_name;
throw Base::TypeError(error);
}
@@ -1999,16 +1996,19 @@ void PropertyMap::setPyObject(PyObject* value)
values[keyStr] = PyUnicode_AsUTF8(item);
}
else {
std::string error("type in list must be string or unicode, not ");
std::string error("type in values must be string, not ");
error += item->ob_type->tp_name;
throw Base::TypeError(error);
}
}
Py_XDECREF(itemList);
Py_XDECREF(keyList);
setValues(values);
}
else {
std::string error("type must be a dict object");
std::string error("type must be a dict or object with mapping protocol, not ");
error += value->ob_type->tp_name;
throw Base::TypeError(error);
}