Merge pull request #893 from lsst/tickets/DM-41164

DM-41164: Fix QG-load breakage from DM-41043.
lsst · Oct 12, 2023 · 73579f0 · 73579f0
2 parents 15f4466 + 97581c4
commit 73579f0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/doc/changes/DM-41164.bugfix.md b/doc/changes/DM-41164.bugfix.md
@@ -0,0 +1 @@
+Fix QuantumGraph-load breakage introduced on DM-41043.
diff --git a/python/lsst/daf/butler/datastore/record_data.py b/python/lsst/daf/butler/datastore/record_data.py
@@ -239,7 +239,18 @@ def from_simple(
         for dataset_id in simple.dataset_ids:
             records[dataset_id] = {}
         for class_name, table_data in simple.records.items():
-            klass = doImportType(class_name)
+            try:
+                klass = doImportType(class_name)
+            except ImportError:
+                # Prior to DM-41043 we were embedding a lsst.daf.butler.core
+                # path in the serialized form, which we never wanted; fix this
+                # one case.
+                if class_name == "lsst.daf.butler.core.storedFileInfo.StoredFileInfo":
+                    from .stored_file_info import StoredFileInfo
+
+                    klass = StoredFileInfo
+                else:
+                    raise
             if not issubclass(klass, StoredDatastoreItemInfo):
                 raise RuntimeError(
                     "The class specified in the SerializedDatastoreRecordData "