Don't try to coerce types to themselves.

This fixes unpersistence of classes whose constructors cannot take an object of the same type. No regression test, because I can't figure out how the existing test code assigns a formatter to ``MetricsExample``.
lsst · Nov 26, 2019 · 3ebe3e4 · 3ebe3e4
1 parent 1ede414
commit 3ebe3e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/python/lsst/daf/butler/formatters/jsonFormatter.py b/python/lsst/daf/butler/formatters/jsonFormatter.py
@@ -139,5 +139,9 @@ def _coerceType(self, inMemoryDataset, storageClass, pytype=None):
             Object of expected type `pytype`.
         """
         if not hasattr(builtins, pytype.__name__):
-            inMemoryDataset = storageClass.assembler().assemble(inMemoryDataset, pytype=pytype)
+            if storageClass.isComposite():
+                inMemoryDataset = storageClass.assembler().assemble(inMemoryDataset, pytype=pytype)
+            elif not isinstance(inMemoryDataset, pytype):
+                # Hope that we can pass the arguments in directly
+                inMemoryDataset = pytype(inMemoryDataset)
         return inMemoryDataset
diff --git a/python/lsst/daf/butler/formatters/yamlFormatter.py b/python/lsst/daf/butler/formatters/yamlFormatter.py
@@ -150,7 +150,7 @@ def _coerceType(self, inMemoryDataset, storageClass, pytype=None):
         if not hasattr(builtins, pytype.__name__):
             if storageClass.isComposite():
                 inMemoryDataset = storageClass.assembler().assemble(inMemoryDataset, pytype=pytype)
-            else:
+            elif not isinstance(inMemoryDataset, pytype):
                 # Hope that we can pass the arguments in directly
                 inMemoryDataset = pytype(inMemoryDataset)
         return inMemoryDataset