relative_to: do not walk up

Author: scivision

+stdlib/+native/relative_to.m

@@ -13,30 +13,21 @@
   return
 end
 
-tp = strsplit(fullfile(target), filesep);
-bp = strsplit(fullfile(base), filesep);
+fs = ["/", filesep];
+
+tp = split(fullfile(target), fs);
+bp = split(fullfile(base), fs);
 
 % Find the common base portion
 n = 0;
 while n < length(tp) && n < length(bp) && strcmp(tp{n+1}, bp{n+1})
   n = n + 1;
 end
 
-% Number of '..' needed
-numUp = length(bp) - n;
-
-relParts = [repmat({'..'}, 1, numUp), tp(n+1:end)];
+rel = join(tp(n+1:end), filesep);
 
-if isempty(relParts)
-  rel = '.';
-else
-  rel = fullfile(relParts{:});
-
-  if isempty(rel)
-    rel = '.';
-  end
+if stdlib.strempty(rel)
+  rel = ".";
 end
 
-rel = string(rel);
-
 end

+stdlib/+python/private/pythonException.m

@@ -2,7 +2,7 @@ function pythonException(e)
 
 switch e.identifier
   case 'MATLAB:Python:PyException'
-    if ~contains(e.message, ["NotADirectoryError", "FileNotFoundError"])
+    if ~contains(e.message, ["is not in the subpath of", "NotADirectoryError", "FileNotFoundError"])
       rethrow(e)
     end
   otherwise, rethrow(e)

+stdlib/+python/relative_to.m

@@ -1,13 +1,15 @@
 function rel = relative_to(base, other)
-arguments
-  base (1,1) string
-  other (1,1) string
+
+rel = "";
+
+if stdlib.strempty(base) || stdlib.strempty(other)
+  return
 end
 
 try
-  rel = string(py.os.path.relpath(other, base));
-catch
-  rel = "";
+  rel = string(py.str(py.pathlib.Path(other).relative_to(base)));
+catch e
+  pythonException(e)
 end
 
 end

+stdlib/strempty.m

@@ -6,7 +6,7 @@
 if isempty(s)
   y = true;
 else
-  y = strlength(s) == 0;
+  y = (strlength(s) == 0) | ismissing(s);
 end
 
 end