kindred/create
1
1
Fork 0
Code Issues 37 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

4
src/Mod/Draft/draftobjects/base.py
View File

@@ -85,7 +85,7 @@ class DraftObject(object):
# Object properties are updated when the document is opened.
self.props_changed_clear()
def __getstate__(self):
def dumps(self):
"""Return a tuple of all serializable objects or None.
When saving the document this object gets stored
@@ -102,7 +102,7 @@ class DraftObject(object):
"""
return self.Type
def __setstate__(self, state):
def loads(self, state):
"""Set some internal properties for all restored objects.
When a document is restored this method is used to set some properties

4
src/Mod/Draft/draftobjects/draft_annotation.py
View File

@@ -82,11 +82,11 @@ class DraftAnnotation(object):
if multiplier is not None:
vobj.ScaleMultiplier = multiplier
def __getstate__(self):
def dumps(self):
return
def __setstate__(self,state):
def loads(self,state):
return

6
src/Mod/Draft/draftobjects/draftlink.py
View File

@@ -64,17 +64,17 @@ class DraftLink(DraftObject):
if obj:
self.attach(obj)
def __getstate__(self):
def dumps(self):
"""Return a tuple of all serializable objects or None."""
return self.__dict__
def __setstate__(self, state):
def loads(self, state):
"""Set some internal properties for all restored objects."""
if isinstance(state, dict):
self.__dict__ = state
else:
self.use_link = False
super(DraftLink, self).__setstate__(state)
super(DraftLink, self).loads(state)
def attach(self, obj):
"""Set up the properties when the object is attached."""

4
src/Mod/Draft/draftobjects/hatch.py
View File

@@ -67,11 +67,11 @@ class Hatch(DraftObject):
self.setProperties(obj)
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None

8
src/Mod/Draft/draftobjects/layer.py
View File

@@ -80,11 +80,11 @@ class Layer:
_wrn("v0.19, " + obj.Label + ", "
+ translate("draft", "added missing view properties"))
def __getstate__(self):
def dumps(self):
"""Return a tuple of objects to save or None."""
return self.Type
def __setstate__(self, state):
def loads(self, state):
"""Set the internal properties from the restored state."""
if state:
self.Type = state
@@ -126,12 +126,12 @@ class LayerContainer:
group.sort(key=lambda layer: layer.Label)
obj.Group = group
def __getstate__(self):
def dumps(self):
"""Return a tuple of objects to save or None."""
if hasattr(self, "Type"):
return self.Type
def __setstate__(self, state):
def loads(self, state):
"""Set the internal properties from the restored state."""
if state:
self.Type = state

4
src/Mod/Draft/draftobjects/text.py
View File

@@ -76,7 +76,7 @@ class Text(DraftAnnotation):
"""Execute code when the document is restored."""
super().onDocumentRestored(obj)
# See __setstate__: self.Type is None for new objects.
# See loads: self.Type is None for new objects.
if self.Type is not None \
and hasattr(obj, "ViewObject") \
and obj.ViewObject:
@@ -93,7 +93,7 @@ class Text(DraftAnnotation):
_wrn("v0.21, " + obj.Label + ", "
+ translate("draft", "renamed 'DisplayMode' options to 'World/Screen'"))
def __setstate__(self,state):
def loads(self,state):
# Before update_properties_0v21 the self.Type value was stored.
# We use this to identify older objects that need to be updated.
self.Type = state

4
src/Mod/Draft/draftobjects/wpproxy.py
View File

@@ -70,10 +70,10 @@ class WorkingPlaneProxy:
def getNormal(self,obj):
return obj.Shape.Faces[0].normalAt(0,0)
def __getstate__(self):
def dumps(self):
return self.Type
def __setstate__(self,state):
def loads(self,state):
if state:
self.Type = state

6
src/Mod/Draft/draftviewproviders/view_base.py
View File

@@ -118,7 +118,7 @@ class ViewProviderDraft(object):
"Defines the size of the SVG pattern."))
vobj.PatternSize = utils.get_param("HatchPatternSize", 1)
def __getstate__(self):
def dumps(self):
"""Return a tuple of all serializable objects or None.
When saving the document this view provider object gets stored
@@ -138,7 +138,7 @@ class ViewProviderDraft(object):
"""
return None
def __setstate__(self, state):
def loads(self, state):
"""Set some internal properties for all restored objects.
When a document is restored this method is used to set some properties
@@ -147,7 +147,7 @@ class ViewProviderDraft(object):
Override this method to define the properties to change for the
restored serialized objects.
By default no objects were serialized with `__getstate__`,
By default no objects were serialized with `dumps`,
so nothing needs to be done here, and it returns `None`.
Parameters

4
src/Mod/Draft/draftviewproviders/view_clone.py
View File

@@ -38,10 +38,10 @@ class ViewProviderClone:
def getIcon(self):
return ":/icons/Draft_Clone.svg"
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self, state):
def loads(self, state):
return None
def getDisplayModes(self, vobj):

4
src/Mod/Draft/draftviewproviders/view_draft_annotation.py
View File

@@ -162,11 +162,11 @@ class ViewProviderDraftAnnotation(object):
"Graphics",
_tip)
def __getstate__(self):
def dumps(self):
"""Return a tuple of objects to save or None."""
return None
def __setstate__(self, state):
def loads(self, state):
"""Set the internal properties from the restored state."""
return None

4
src/Mod/Draft/draftviewproviders/view_hatch.py
View File

@@ -41,11 +41,11 @@ class ViewProviderDraftHatch:
return ":/icons/Draft_Hatch.svg"
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self, state):
def loads(self, state):
return None

8
src/Mod/Draft/draftviewproviders/view_layer.py
View File

@@ -204,11 +204,11 @@ class ViewProviderLayer:
"""Return the saved display mode."""
return mode
def __getstate__(self):
def dumps(self):
"""Return a tuple of objects to save or None."""
return None
def __setstate__(self, state):
def loads(self, state):
"""Set the internal properties from the restored state."""
return None
@@ -574,11 +574,11 @@ class ViewProviderLayerContainer:
doc.recompute()
doc.commitTransaction()
def __getstate__(self):
def dumps(self):
"""Return a tuple of objects to save or None."""
return None
def __setstate__(self, state):
def loads(self, state):
"""Set the internal properties from the restored state."""
return None

4
src/Mod/Draft/draftviewproviders/view_wpproxy.py
View File

@@ -227,10 +227,10 @@ class ViewProviderWorkingPlaneProxy:
self.drawstyle.lineWidth = vobj.LineWidth
return
def __getstate__(self):
def dumps(self):
return None
def __setstate__(self,state):
def loads(self,state):
return None
## @}