Rename .transport.util.region_path_fallback()

Avoid duplicating the name of package .util.path_fallback() with
different behaviour.

Author: khaeru

message_ix_models/model/transport/data.py

@@ -150,7 +150,7 @@ class MaybeAdaptR11Source(ExoDataSource):
     _adapter: Optional[Callable] = None
 
     def __init__(self, source, source_kw):
-        from .util import path_fallback
+        from .util import region_path_fallback
 
         # Check that the given measure is supported by the current class
         if not source == self.id:
@@ -175,11 +175,11 @@ def __init__(self, source, source_kw):
 
         filename = self.filename[measure]
         try:
-            self.path = path_fallback(nodes, filename)
+            self.path = region_path_fallback(nodes, filename)
             self._repr = f"Load {self.path}"
         except FileNotFoundError:
             log.info(f"Fall back to R11 data for {self.measure}")
-            self.path = path_fallback("R11", filename)
+            self.path = region_path_fallback("R11", filename)
 
             # Identify an adapter that can convert data from R11 to `nodes`
             self._adapter = {"R12": adapt_R11_R12, "R14": adapt_R11_R14}.get(nodes)

message_ix_models/model/transport/emission.py

@@ -11,7 +11,7 @@
 
 from message_ix_models.util import package_data_path
 
-from .util import path_fallback
+from .util import region_path_fallback
 
 if TYPE_CHECKING:
     from genno.types import AnyQuantity
@@ -26,7 +26,7 @@ def get_emissions_data(context: "Context") -> "ParameterData":
     """Load emissions data from a file."""
 
     fn = f"{context.transport.data_source.emissions}-emission_factor.csv"
-    qty = load_file(path_fallback(context, "emi", fn))
+    qty = load_file(region_path_fallback(context, "emi", fn))
 
     return dict(emission_factor=qty.to_dataframe())
 

message_ix_models/model/transport/structure.py

@@ -11,7 +11,7 @@
 from message_ix_models.model.structure import generate_set_elements, get_region_codes
 from message_ix_models.util import load_package_data, package_data_path
 
-from .util import path_fallback
+from .util import region_path_fallback
 
 #: Template for disutility technologies.
 TEMPLATE = Code(
@@ -80,7 +80,7 @@ def make_spec(regions: str) -> Spec:
 
         # Load and store the data from the YAML file: either in a subdirectory for
         # context.model.regions, or the top-level data directory
-        path = path_fallback(regions, fn).relative_to(package_data_path())
+        path = region_path_fallback(regions, fn).relative_to(package_data_path())
         tmp[name] = load_package_data(*path.parts)
 
     # Merge contents of technology.yaml into set.yaml

message_ix_models/model/transport/util.py

@@ -32,7 +32,7 @@ def has_input_commodity(technology: "Code", commodity: str) -> bool:
         return False
 
 
-def path_fallback(context_or_regions: Union[Context, str], *parts) -> Path:
+def region_path_fallback(context_or_regions: Union[Context, str], *parts) -> Path:
     """Return a :class:`.Path` constructed from `parts`.
 
     If ``context.model.regions`` (or a string value as the first argument) is defined

message_ix_models/util/sdmx.py

@@ -367,11 +367,11 @@ def add_tasks(
     ) -> tuple["KeyLike", ...]:
         """Prepare `c` to read data from a file at :attr:`.path`."""
         # TODO Use a package-wide utility or a callback
-        from message_ix_models.model.transport.util import path_fallback
+        from message_ix_models.model.transport.util import region_path_fallback
 
         # Identify the path
         try:
-            path = path_fallback(context, self.path)
+            path = region_path_fallback(context, self.path)
         except FileNotFoundError:
             if self.required:
                 raise