refactor(MFFileMgmt): convert to posix path in strip_model_relative_path

modflowpy · Apr 15, 2023 · de8efdf · de8efdf
1 parent ec65d0c
commit de8efdf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/autotest/test_mf6.py b/autotest/test_mf6.py
@@ -390,7 +390,7 @@ def test_basic_gwf(function_tmpdir, filename):
     tdis_name = f"{name}.tdis"
     tdis_path = innerdir / tdis_name
     tdis_path.touch()
-    tdis_relpath = tdis_path.relative_to(ws)
+    tdis_relpath = tdis_path.relative_to(ws).as_posix()
     tdis_relpath_win = str(tdis_relpath).replace("/", "\\")
 
     if filename == "name":

diff --git a/flopy/mf6/mfbase.py b/flopy/mf6/mfbase.py
@@ -10,6 +10,7 @@
 from pathlib import Path
 from shutil import copyfile
 from typing import Union
+from warnings import warn
 
 
 # internal handled exceptions
@@ -289,9 +290,14 @@ def strip_model_relative_path(self, model_name, path) -> str:
             return path
 
         try:
-            return str(Path(path).relative_to(model_rel_path))
+            ret_path = Path(path).relative_to(model_rel_path)
         except ValueError:
-            return str(Path(model_rel_path) / path)
+            warnings.warn(
+                f"Could not strip model relative path from {path}: {traceback.format_exc()}"
+            )
+            ret_path = Path(path)
+
+        return str(ret_path.as_posix())
 
     @staticmethod
     def unique_file_name(file_name, lookup):