Merge pull request #120 from lsst/tickets/DM-21855

DM-21855: Move daf.butler.instrument to obs_base
lsst · Nov 9, 2019 · c381ef5 · c381ef5
2 parents c69d46e + 9e7053e
commit c381ef5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/python/lsst/obs/decam/instrument.py b/python/lsst/obs/decam/instrument.py
@@ -27,7 +27,7 @@
 import os
 
 from lsst.afw.cameraGeom import makeCameraFromPath, CameraConfig
-from lsst.daf.butler.instrument import Instrument
+from lsst.obs.base import Instrument
 from lsst.obs.decam.decamFilters import DECAM_FILTER_DEFINITIONS
 
 from lsst.utils import getPackageDir

diff --git a/tests/test_instrument.py b/tests/test_instrument.py
@@ -25,7 +25,7 @@
 import unittest
 
 import lsst.utils.tests
-from lsst.daf.butler.instrument_tests import InstrumentTests, InstrumentTestData
+from lsst.obs.base.instrument_tests import InstrumentTests, InstrumentTestData
 import lsst.obs.decam