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

App: fix PropertyPythonObject persistence backward compatibility

Browse Source 
Related #10460
This commit is contained in:
Zheng, Lei
2024-02-03 09:22:28 +08:00
committed by Chris Hennes
parent 2b8fc87d6a
commit e5e08262c2
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/App/PropertyPythonObject.cpp
View File

@@ -92,14 +92,17 @@ std::string PropertyPythonObject::toString() const
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__")) {
else if (this->object.hasAttr("__getstate__")
#if PY_VERSION_HEX >= 0x030b0000
&& this->object.getAttr("__getstate__").hasAttr("__func__")
#endif
)
{
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__");
}
@@ -143,15 +146,18 @@ void PropertyPythonObject::fromString(const std::string& repr)
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__")) {
else if (this->object.hasAttr("__setstate__")
#if PY_VERSION_HEX >= 0x030b0000
&& this->object.getAttr("__setstate__").hasAttr("__func__")
#endif
)
{
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);