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

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

View File

@@ -180,11 +180,11 @@ class _Axis:
if prop in ["Angles","Distances","Placement"]:
obj.touch()
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None
@@ -658,11 +658,11 @@ class _ViewProviderAxis:
def transform(self):
FreeCADGui.ActiveDocument.setEdit(self.Object, 1)
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None

View File

@@ -136,11 +136,11 @@ class _AxisSystem:
for o in obj.Axes:
o.Placement = delta.multiply(o.Placement)
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None
@@ -259,11 +259,11 @@ class _ViewProviderAxisSystem:
def edit(self):
FreeCADGui.ActiveDocument.setEdit(self.Object, 0)
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None

View File

@@ -356,11 +356,11 @@ class BuildingPart(ArchIFC.IfcProduct):
self.setProperties(obj)
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None
@@ -1054,10 +1054,10 @@ class ViewProviderBuildingPart:
no.LongName = no.CloneOf.LongName
FreeCAD.ActiveDocument.recompute()
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None
def writeInventor(self,obj):

View File

@@ -267,13 +267,13 @@ class Component(ArchIFC.IfcProduct):
shape = self.processSubShapes(obj,shape)
obj.Shape = shape
def __getstate__(self):
def dumps(self):
# for compatibility with 0.17
if hasattr(self,"Type"):
return self.Type
return "Component"
def __setstate__(self,state):
def loads(self,state):
return None
def onBeforeChange(self,obj,prop):
@@ -1408,11 +1408,11 @@ class ViewProviderComponent:
return "Flat Lines"
return mode
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None

View File

@@ -81,13 +81,13 @@ class _Fence(ArchComponent.Component):
self.Type = "Fence"
def __getstate__(self):
def dumps(self):
if hasattr(self, 'sectionFaceNumbers'):
return self.sectionFaceNumbers
return None
def __setstate__(self, state):
def loads(self, state):
if state is not None and isinstance(state, tuple):
self.sectionFaceNumbers = state[0]

View File

@@ -218,11 +218,11 @@ class _Floor(ArchIFC.IfcProduct):
_Floor.setProperties(self,obj)
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None
@@ -372,11 +372,11 @@ class _ViewProviderFloor:
return self.Object.Group
return []
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None

View File

@@ -279,11 +279,11 @@ class ArchGrid:
else:
return [f.CenterOfMass for f in obj.Shape.Faces]
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None
@@ -330,11 +330,11 @@ class ViewProviderArchGrid:
def edit(self):
FreeCADGui.ActiveDocument.setEdit(self.Object, 0)
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None

View File

@@ -80,10 +80,10 @@ class IfcContextView:
def transform(self):
FreeCADGui.ActiveDocument.setEdit(self.Object, 1)
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None

View File

@@ -186,11 +186,11 @@ class _ArchMaterialContainer:
def execute(self,obj):
return
def __getstate__(self):
def dumps(self):
if hasattr(self,"Type"):
return self.Type
def __setstate__(self,state):
def loads(self,state):
if state:
self.Type = state
@@ -266,10 +266,10 @@ class _ViewProviderArchMaterialContainer:
self.Object.Group = g
FreeCAD.ActiveDocument.recompute()
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None
@@ -410,11 +410,11 @@ class _ArchMaterial:
p.ViewObject.ShapeColor = c
return
def __getstate__(self):
def dumps(self):
if hasattr(self,"Type"):
return self.Type
def __setstate__(self,state):
def loads(self,state):
if state:
self.Type = state
@@ -510,10 +510,10 @@ class _ViewProviderArchMaterial:
elif hasattr(widget,"setValue"):
widget.setText(value)
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None
def claimChildren(self):
@@ -744,11 +744,11 @@ class _ArchMultiMaterial:
obj.addProperty("App::PropertyLinkList","Materials","Arch",QT_TRANSLATE_NOOP("App::Property","The list of layer materials"))
obj.addProperty("App::PropertyFloatList","Thicknesses","Arch",QT_TRANSLATE_NOOP("App::Property","The list of layer thicknesses"))
def __getstate__(self):
def dumps(self):
if hasattr(self,"Type"):
return self.Type
def __setstate__(self,state):
def loads(self,state):
if state:
self.Type = state
@@ -794,10 +794,10 @@ class _ViewProviderArchMultiMaterial:
def edit(self):
FreeCADGui.ActiveDocument.setEdit(self.Object, 0)
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None
def isShow(self):

View File

@@ -238,11 +238,11 @@ class _Profile(Draft._DraftObject):
self.Profile = profile
Draft._DraftObject.__init__(self,obj,"Profile")
def __getstate__(self):
def dumps(self):
if hasattr(self,"Profile"):
return self.Profile
def __setstate__(self,state):
def loads(self,state):
if isinstance(state,list):
self.Profile = state
self.Type = "Profile"

View File

@@ -113,11 +113,11 @@ class ArchReference:
if obj.ViewObject and obj.ViewObject.Proxy:
obj.ViewObject.Proxy.loadInventor(obj)
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None
@@ -395,11 +395,11 @@ class ViewProviderArchReference:
s = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Arch").GetInt("ReferenceCheckInterval",60)
self.timer.start(1000*s)
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None

View File

@@ -401,11 +401,11 @@ class _ArchSchedule:
print("TOTAL:"+34*" "+v)
self.setSpreadsheetData(obj)
def __getstate__(self):
def dumps(self):
return self.Type
def __setstate__(self,state):
def loads(self,state):
if state:
self.Type = state
@@ -477,10 +477,10 @@ class _ViewProviderArchSchedule:
if hasattr(self,"Object"):
return [self.Object.Proxy.getSpreadSheet(self.Object)]
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None
def getDisplayModes(self,vobj):

View File

@@ -902,11 +902,11 @@ class _SectionPlane:
return obj.Shape.Faces[0].normalAt(0,0)
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None
@@ -1152,11 +1152,11 @@ class _ViewProviderSectionPlane:
self.txtfont.size = vobj.FontSize.Value
return
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None

View File

@@ -818,11 +818,11 @@ class _Site(ArchIFC.IfcProduct):
g.append(child)
obj.Group = g
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None
@@ -1223,11 +1223,11 @@ class _ViewProviderSite:
return
self.compass.scale(vobj.Object.ProjectedArea)
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None

View File

@@ -27,7 +27,7 @@ class ifc_object:
def onDocumentRestored(self, obj):
obj.Type = [obj.IfcType]
obj.Type = obj.IfcType
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self, state):
def loads(self, state):
return None