Switch back to lifting Location and FileDescriptor to package scope.

These are part of the Formatter API, and as much as we'd like it to be
that's not just a FileDatastore implementation detail right now.

python/lsst/daf/butler/__init__.py

@@ -50,10 +50,12 @@
 from ._deferredDatasetHandle import *
 from ._exceptions import *
 from ._file_dataset import *
+from ._file_descriptor import *
 from ._formatter import *
 
 # Do not import 'instrument' or 'json' at all by default.
 from ._limited_butler import *
+from ._location import *
 from ._named import *
 from ._quantum import *
 from ._quantum_backed import *

python/lsst/daf/butler/datastore/file_descriptor.py → python/lsst/daf/butler/_file_descriptor.py

@@ -32,8 +32,8 @@
 from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:
-    from .._storage_class import StorageClass
-    from .location import Location
+    from ._location import Location
+    from ._storage_class import StorageClass
 
 
 class FileDescriptor:

python/lsst/daf/butler/_formatter.py

@@ -42,9 +42,9 @@
 from ._config_support import LookupKey, processLookupConfigs
 from ._dataset_ref import DatasetRef
 from ._dataset_type import DatasetType
+from ._file_descriptor import FileDescriptor
+from ._location import Location
 from ._storage_class import StorageClass
-from .datastore.file_descriptor import FileDescriptor
-from .datastore.location import Location
 from .dimensions import DimensionUniverse
 from .mapping_factory import MappingFactory
 

python/lsst/daf/butler/datastore/stored_file_info.py

@@ -37,8 +37,8 @@
 from lsst.resources import ResourcePath
 
 from .._formatter import Formatter, FormatterParameter
+from .._location import Location, LocationFactory
 from .._storage_class import StorageClass, StorageClassFactory
-from .location import Location, LocationFactory
 
 if TYPE_CHECKING:
     from .. import DatasetId, DatasetRef

python/lsst/daf/butler/datastores/fileDatastore.py

@@ -47,8 +47,11 @@
     DatasetTypeNotSupportedError,
     Datastore,
     FileDataset,
+    FileDescriptor,
     Formatter,
     FormatterFactory,
+    Location,
+    LocationFactory,
     Progress,
     StorageClass,
     ddl,
@@ -60,9 +63,7 @@
     DatastoreDisabledCacheManager,
 )
 from lsst.daf.butler.datastore.composites import CompositesMap
-from lsst.daf.butler.datastore.file_descriptor import FileDescriptor
 from lsst.daf.butler.datastore.file_templates import FileTemplates, FileTemplateValidationError
-from lsst.daf.butler.datastore.location import Location, LocationFactory
 from lsst.daf.butler.datastore.record_data import DatastoreRecordData
 from lsst.daf.butler.datastore.stored_file_info import StoredDatastoreItemInfo, StoredFileInfo
 from lsst.daf.butler.registry.interfaces import (

python/lsst/daf/butler/tests/testFormatters.py

@@ -46,7 +46,7 @@
 from ..formatters.yaml import YamlFormatter
 
 if TYPE_CHECKING:
-    from ..datastore.location import Location
+    from .._location import Location
 
 
 class DoNothingFormatter(Formatter):

tests/test_formatter.py

@@ -38,12 +38,12 @@
     DatasetType,
     DimensionGraph,
     DimensionUniverse,
+    FileDescriptor,
     Formatter,
     FormatterFactory,
+    Location,
     StorageClass,
 )
-from lsst.daf.butler.datastore.file_descriptor import FileDescriptor
-from lsst.daf.butler.datastore.location import Location
 from lsst.daf.butler.tests import DatasetTestHelper
 from lsst.daf.butler.tests.testFormatters import (
     DoNothingFormatter,

tests/test_location.py

@@ -29,7 +29,7 @@
 import posixpath
 import unittest
 
-from lsst.daf.butler.datastore.location import Location, LocationFactory
+from lsst.daf.butler import Location, LocationFactory
 from lsst.resources import ResourcePath