Remove repo alias finding from multiple places

Now works directly with ButlerConfig.
lsst · Jun 7, 2023 · c7a57fc · c7a57fc
1 parent 3bf75af
commit c7a57fc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 25 deletions.
diff --git a/python/lsst/daf/butler/_butler.py b/python/lsst/daf/butler/_butler.py
@@ -229,25 +229,7 @@ def __init__(
             self.storageClasses = butler.storageClasses
             self._config: ButlerConfig = butler._config
         else:
-            # Can only look for strings in the known repos list.
-            if isinstance(config, str):
-                # Somehow ButlerConfig fails in some cases if config is a
-                # ResourcePath, force it back to string here.
-                try:
-                    config = str(self.get_repo_uri(config, True))
-                except FileNotFoundError:
-                    pass
-            try:
-                self._config = ButlerConfig(config, searchPaths=searchPaths)
-            except FileNotFoundError as e:
-                if known := self.get_known_repos():
-                    aliases = f"(known aliases: {', '.join(known)})"
-                else:
-                    failure_reason = ButlerRepoIndex.get_failure_reason()
-                    if failure_reason:
-                        failure_reason = f": {failure_reason}"
-                    aliases = f"(no known aliases{failure_reason})"
-                raise FileNotFoundError(f"{e} {aliases}") from e
+            self._config = ButlerConfig(config, searchPaths=searchPaths)
             try:
                 if "root" in self._config:
                     butlerRoot = self._config["root"]

diff --git a/python/lsst/daf/butler/_quantum_backed.py b/python/lsst/daf/butler/_quantum_backed.py
@@ -34,7 +34,6 @@
 from pydantic import BaseModel
 
 from ._butlerConfig import ButlerConfig
-from ._butlerRepoIndex import ButlerRepoIndex
 from ._deferredDatasetHandle import DeferredDatasetHandle
 from ._limited_butler import LimitedButler
 from .core import (
@@ -332,8 +331,6 @@ def _initialize(
         dataset_types: `Mapping` [`str`, `DatasetType`]
             Mapping of the dataset type name to its registry definition.
         """
-        if isinstance(config, str):
-            config = ButlerRepoIndex.get_repo_uri(config, True)
         butler_config = ButlerConfig(config, searchPaths=search_paths)
         if "root" in butler_config:
             butler_root = butler_config["root"]

diff --git a/python/lsst/daf/butler/script/configDump.py b/python/lsst/daf/butler/script/configDump.py
@@ -24,7 +24,6 @@
 from typing import IO
 
 from .._butlerConfig import ButlerConfig
-from .._butlerRepoIndex import ButlerRepoIndex
 
 
 def configDump(repo: str, subset: str, searchpath: str, outfile: IO) -> None:
@@ -50,8 +49,7 @@ def configDump(repo: str, subset: str, searchpath: str, outfile: IO) -> None:
     AttributeError
         If there is an issue dumping the configuration.
     """
-    repo_path = ButlerRepoIndex.get_repo_uri(repo, True)
-    config = ButlerConfig(repo_path, searchPaths=searchpath)
+    config = ButlerConfig(repo, searchPaths=searchpath)
     if subset is not None:
         try:
             config = config[subset]