relative_to subfunction

Author: scivision

+stdlib/+dotnet/relative_to.m

@@ -0,0 +1,22 @@
+function rel = relative_to(base, other)
+
+if strempty(other)
+  rel = base;
+  return
+end
+if strempty(base)
+  rel = other;
+  return
+end
+
+base = fullfile(base);
+other = fullfile(other);
+
+if stdlib.is_absolute(base) && ~(startsWith(base, other) || startsWith(other, base))
+  rel = "";
+else
+  % https://learn.microsoft.com/en-us/dotnet/api/system.io.path.getrelativepath
+  rel = string(System.IO.Path.GetRelativePath(base, other));
+end
+
+end

+stdlib/+python/relative_to.m

@@ -0,0 +1,13 @@
+function rel = relative_to(base, other)
+
+try
+  rel = string(py.os.path.relpath(other, base));
+catch e
+  if e.identifier == "MATLAB:Python:PyException" && startsWith(e.message, 'Python Error: ValueError')
+    rel = "";
+  else
+    rethrow(e)
+  end
+end
+
+end

+stdlib/proximate_to.m

@@ -17,7 +17,4 @@
   rel = other;
 end
 
-
 end
-
-%!testif 0

+stdlib/python_version.m

@@ -17,10 +17,10 @@
   force_old (1,1) logical = false
 end
 
-persistent v_
+persistent stdlib_py_version
 
-if ~isempty(v_)
-  v = v_;
+if ~isempty(stdlib_py_version)
+  v = stdlib_py_version;
   return
 end
 
@@ -32,13 +32,13 @@
 end
 
 % we use a separate function because the JIT compiler in Matlab < R2022a
-% breaks try-catch for any py.* command
+% breaks for any py.* command when pyenv() is not correctly configured
 
 v = stdlib.python.version();
 
 % cache the result
 if ~isempty(v)
-  v_ = v;
+  stdlib_py_version = v;
 end
 
 end

+stdlib/relative_to.m

@@ -23,52 +23,11 @@
 end
 
 if stdlib.has_python()
-  rel = relative_to_python(base, other);
+  rel = stdlib.python.relative_to(base, other);
 elseif stdlib.dotnet_api() >= 5
-  rel = relative_to_dotnet(base, other);
+  rel = stdlib.dotnet.relative_to(base, other);
 else
   error('no supported relative path method found, please install .NET or "buildtool mex"')
 end
 
 end
-
-
-function rel = relative_to_dotnet(base, other)
-
-if strempty(other)
-  rel = base;
-  return
-end
-if strempty(base)
-  rel = other;
-  return
-end
-
-base = fullfile(base);
-other = fullfile(other);
-
-if stdlib.is_absolute(base) && ~(startsWith(base, other) || startsWith(other, base))
-  rel = "";
-else
-  % https://learn.microsoft.com/en-us/dotnet/api/system.io.path.getrelativepath
-  rel = string(System.IO.Path.GetRelativePath(base, other));
-end
-
-end
-
-
-function rel = relative_to_python(base, other)
-
-try
-  rel = string(py.os.path.relpath(other, base));
-catch e
-  if e.identifier == "MATLAB:Python:PyException" && startsWith(e.message, 'Python Error: ValueError')
-    rel = "";
-  else
-    rethrow(e)
-  end
-end
-
-end
-
-%!testif 0