Merge pull request #391 from lsst/tickets/DM-31722

DM-31722: Use lsst.utils.introspection.get_full_type_name instead
lsst · Oct 8, 2021 · 984b2ff · 984b2ff
2 parents 59bf897 + df5e91b
commit 984b2ff
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/python/lsst/obs/base/_fitsRawFormatterBase.py b/python/lsst/obs/base/_fitsRawFormatterBase.py
@@ -30,8 +30,8 @@
 import lsst.afw.fits
 import lsst.afw.geom
 import lsst.afw.image
+from lsst.utils.classes import cached_getter
 from lsst.daf.butler import FileDescriptor
-from lsst.daf.butler.core.utils import cached_getter
 
 from .formatters.fitsExposure import FitsImageFormatterBase, standardizeAmplifierParameters
 from .makeRawVisitInfoViaObsInfo import MakeRawVisitInfoViaObsInfo

diff --git a/python/lsst/obs/base/formatters/fitsExposure.py b/python/lsst/obs/base/formatters/fitsExposure.py
@@ -32,7 +32,7 @@
 
 from lsst.daf.base import PropertySet
 from lsst.daf.butler import Formatter
-from lsst.daf.butler.core.utils import cached_getter
+from lsst.utils.classes import cached_getter
 from lsst.afw.cameraGeom import AmplifierGeometryComparison, AmplifierIsolator
 from lsst.afw.image import ExposureFitsReader, ImageFitsReader, MaskFitsReader, MaskedImageFitsReader
 from lsst.afw.image import ExposureInfo, FilterLabel

diff --git a/python/lsst/obs/base/instrument_tests.py b/python/lsst/obs/base/instrument_tests.py
@@ -35,7 +35,7 @@
 from lsst.obs.base.yamlCamera import makeCamera
 from lsst.daf.butler import Registry
 from lsst.daf.butler import RegistryConfig
-from lsst.daf.butler.core.utils import getFullTypeName
+from lsst.utils.introspection import get_full_type_name
 from lsst.daf.butler.formatters.yaml import YamlFormatter
 
 from .utils import createInitialSkyWcsFromBoresight
@@ -82,7 +82,7 @@ def register(self, registry, update=False):
         `Registry`.
         """
         detector_max = 2
-        dataId = {"instrument": self.getName(), "class_name": getFullTypeName(DummyCam),
+        dataId = {"instrument": self.getName(), "class_name": get_full_type_name(DummyCam),
                   "detector_max": detector_max}
         with registry.transaction():
             registry.syncDimensionData("instrument", dataId, update=update)

diff --git a/tests/test_ingest.py b/tests/test_ingest.py
@@ -29,7 +29,7 @@
 import lsst.daf.butler.tests as butlerTests
 from lsst.daf.butler import DatasetType, Butler, DataCoordinate, Config
 from lsst.daf.butler.registry import ConflictingDefinitionError
-from lsst.daf.butler.core.utils import getFullTypeName
+from lsst.utils.introspection import get_full_type_name
 
 from lsst.obs.base.ingest_tests import IngestTestBase
 from lsst.obs.base.instrument_tests import DummyCam
@@ -55,7 +55,7 @@ class RawIngestTestCase(IngestTestBase, unittest.TestCase):
     """Test ingest using JSON sidecar files."""
 
     ingestDatasetTypeName = "raw_dict"
-    rawIngestTask = getFullTypeName(DummyCamRawIngestTask)
+    rawIngestTask = get_full_type_name(DummyCamRawIngestTask)
     curatedCalibrationDatasetTypes = ()
     ingestDir = TESTDIR
     instrumentClassName = "lsst.obs.base.instrument_tests.DummyCam"