Merge pull request #34 from lsst/tickets/DM-14503

DM-14503: Handle pickle state for PropertySet.
lsst · Jul 7, 2018 · 099ede0 · 099ede0
2 parents aa1012f + 02cb822
commit 099ede0
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/python/lsst/daf/base/propertyContainer/propertyContainerContinued.py b/python/lsst/daf/base/propertyContainer/propertyContainerContinued.py
@@ -187,14 +187,24 @@ def _propertyContainerAdd(container, name, value, typeMenu, *args):
 
 
 def getstate(self):
-    return [(name, _propertyContainerElementTypeName(self, name),
-             _propertyContainerGet(self, name, returnStyle=ReturnStyle.AUTO),
-             self.getComment(name)) for name in self.getOrderedNames()]
+    if isinstance(self, PropertyList):
+        return [(name, _propertyContainerElementTypeName(self, name),
+                 _propertyContainerGet(self, name, returnStyle=ReturnStyle.AUTO),
+                 self.getComment(name))
+                for name in self.getOrderedNames()]
+    else:
+        return [(name, _propertyContainerElementTypeName(self, name),
+                 _propertyContainerGet(self, name, returnStyle=ReturnStyle.AUTO))
+                for name in self.paramNames(False)]
 
 
 def setstate(self, state):
-    for name, elemType, value, comment in state:
-        getattr(self, "set" + elemType)(name, value, comment)
+    if isinstance(self, PropertyList):
+        for name, elemType, value, comment in state:
+            getattr(self, "set" + elemType)(name, value, comment)
+    else:
+        for name, elemType, value in state:
+            getattr(self, "set" + elemType)(name, value)
 
 
 @continueClass