Merge pull request #489 from lsst/tickets/DM-45738

DM-45738: Force collections to a list to ensure compatibility
lsst · Aug 19, 2024 · ab84bed · ab84bed
2 parents d68a17e + d2a9315
commit ab84bed
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/python/lsst/obs/base/_instrument.py b/python/lsst/obs/base/_instrument.py
@@ -713,7 +713,7 @@ def loadCamera(butler: Butler, dataId: DataId, *, collections: Any = None) -> tu
         Raised when ``dataId`` does not specify a valid data ID.
     """
     if collections is None:
-        collections = butler.collections
+        collections = list(butler.collections)
     # Registry would do data ID expansion internally if we didn't do it first,
     # but we might want an expanded data ID ourselves later, so we do it here
     # to ensure it only happens once.

diff --git a/python/lsst/obs/base/defineVisits.py b/python/lsst/obs/base/defineVisits.py
@@ -1214,7 +1214,7 @@ def computeExposureBounds(
             sphere representing that detector's corners projected onto the sky.
         """
         if collections is None:
-            collections = self.butler.collections
+            collections = list(self.butler.collections)
         camera, versioned = loadCamera(self.butler, exposure.dataId, collections=collections)
         if not versioned and self.config.requireVersionedCamera:
             raise LookupError(f"No versioned camera found for exposure {exposure.dataId}.")

diff --git a/tests/test_defineVisits.py b/tests/test_defineVisits.py
@@ -197,7 +197,7 @@ def testPickleTask(self):
         self.assertEqual(self.task.log.name, copy.log.name)
         self.assertEqual(self.task.config, copy.config)
         self.assertEqual(self.task.butler._config, copy.butler._config)
-        self.assertEqual(self.task.butler.collections, copy.butler.collections)
+        self.assertEqual(list(self.task.butler.collections), list(copy.butler.collections))
         self.assertEqual(self.task.butler.run, copy.butler.run)
         self.assertEqual(self.task.universe, copy.universe)
 

diff --git a/tests/test_ingest.py b/tests/test_ingest.py
@@ -467,7 +467,7 @@ def testPickleTask(self):
         self.assertEqual(self.task.log.name, copy.log.name)
         self.assertEqual(self.task.config, copy.config)
         self.assertEqual(self.task.butler._config, copy.butler._config)
-        self.assertEqual(self.task.butler.collections, copy.butler.collections)
+        self.assertEqual(list(self.task.butler.collections), list(copy.butler.collections))
         self.assertEqual(self.task.butler.run, copy.butler.run)
         self.assertEqual(self.task.universe, copy.universe)
         self.assertEqual(self.task.datasetType, copy.datasetType)