DM-21357: Add value and items methods to PropertySet/List

python/lsst/daf/base/propertyContainer/propertyContainerContinued.py

@@ -26,7 +26,7 @@
 
 import enum
 import numbers
-from collections.abc import Mapping, KeysView
+from collections.abc import Mapping, KeysView, ValuesView, ItemsView
 
 # Ensure that C++ exceptions are properly translated to Python
 import lsst.pex.exceptions  # noqa: F401
@@ -600,6 +600,12 @@ def __iter__(self):
     def keys(self):
         return KeysView(self)
 
+    def items(self):
+        return ItemsView(self)
+
+    def values(self):
+        return ValuesView(self)
+
     def __reduce__(self):
         # It would be a bit simpler to use __setstate__ and __getstate__.
         # However, implementing __setstate__ in Python causes segfaults

tests/test_dict.py

@@ -123,6 +123,19 @@ def testDictPropertySet(self):
         for k in keys:
             self.assertIn(k, container)
 
+        for k, v in container.items():
+            self.assertIn(k, container)
+            self.assertEqual(v, container[k])
+
+        # Check that string form of the non-PropertySet values are present
+        # when iterating over values.  This is a simple test to ensure
+        # that values() does do something useful
+        values = {str(container[k]) for k in container if not isinstance(container[k],
+                                                                         lsst.daf.base.PropertySet)}
+        for v in container.values():
+            if not isinstance(v, lsst.daf.base.PropertySet):
+                self.assertIn(str(v), values)
+
         # Assign a PropertySet
         ps2 = lsst.daf.base.PropertySet()
         ps2.setString("newstring", "stringValue")
@@ -163,6 +176,10 @@ def testDictPropertyList(self):
         for k in keys:
             self.assertIn(k, container)
 
+        for k, v in container.items():
+            self.assertIn(k, container)
+            self.assertEqual(v, container[k])
+
         # Assign a PropertySet
         ps2 = lsst.daf.base.PropertySet()
         ps2["newstring"] = "stringValue"