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

Merge branch 'master' into User/Document/Feature_level_units_selection_#7746

Browse Source
This commit is contained in:
AgCaliva
2023-09-25 22:58:23 -03:00
committed by GitHub
parent 8f053e5f71 70894e7cbd
commit 1f9bae0de7
1116 changed files with 111507 additions and 90989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/App/PropertyPythonObject.cpp
View File

@@ -92,11 +92,19 @@ std::string PropertyPythonObject::toString() const
throw Py::Exception();
Py::Callable method(pickle.getAttr(std::string("dumps")));
Py::Object dump;
if (this->object.hasAttr("__getstate__")) {
if (this->object.hasAttr("dumps")) {
Py::Tuple args;
Py::Callable state(this->object.getAttr("dumps"));
dump = state.apply(args);
}
#if PY_VERSION_HEX < 0x030b0000
// support add-ons that use the old method names
else if (this->object.hasAttr("__getstate__")) {
Py::Tuple args;
Py::Callable state(this->object.getAttr("__getstate__"));
dump = state.apply(args);
}
#endif
else if (this->object.hasAttr("__dict__")) {
dump = this->object.getAttr("__dict__");
}
@@ -134,12 +142,21 @@ void PropertyPythonObject::fromString(const std::string& repr)
args.setItem(0, Py::String(repr));
Py::Object res = method.apply(args);
if (this->object.hasAttr("__setstate__")) {
if (this->object.hasAttr("loads")) {
Py::Tuple args(1);
args.setItem(0, res);
Py::Callable state(this->object.getAttr("loads"));
state.apply(args);
}
#if PY_VERSION_HEX < 0x030b0000
// support add-ons that use the old method names
else if (this->object.hasAttr("__setstate__")) {
Py::Tuple args(1);
args.setItem(0, res);
Py::Callable state(this->object.getAttr("__setstate__"));
state.apply(args);
}
#endif
else if (this->object.hasAttr("__dict__")) {
if (!res.isNone()) {
this->object.setAttr("__dict__", res);