App: fix PropertyPythonObject persistence backward compatibility

Related to #10460 and backport of PR #12243
FreeCAD · Mar 26, 2024 · fe9b5be · fe9b5be
1 parent dad39f1
commit fe9b5be
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/App/PropertyPythonObject.cpp b/src/App/PropertyPythonObject.cpp
@@ -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);