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

App: fixes #10460: App::PropertyPythonObject is not saving data

Browse Source 
Since Py3.11 the methods names __setstate__ and __getstate__ conflict with the method names added to the object class.
Thus rename them to 'loads' and 'dumps'
This commit is contained in:
wmayer
2023-09-22 16:06:21 +02:00
committed by Chris Hennes
parent 97d84ec184
commit 83d4080fe8
75 changed files with 227 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/App/PropertyPythonObject.cpp
View File

@@ -87,9 +87,9 @@ 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("__getstate__"));
Py::Callable state(this->object.getAttr("dumps"));
dump = state.apply(args);
}
else if (this->object.hasAttr("__dict__")) {
@@ -129,10 +129,10 @@ 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("__setstate__"));
Py::Callable state(this->object.getAttr("loads"));
state.apply(args);
}
else if (this->object.hasAttr("__dict__")) {