python.version: increase robustness

Author: scivision

+stdlib/+legacy/get_permissions.m

@@ -2,8 +2,8 @@
 
 p = '';
 
-if ~stdlib.exists(file), return, end
-
-p = stdlib.native.perm2char(filePermissions(file), file);
+if stdlib.exists(file)
+  p = stdlib.native.perm2char(file_attributes(file), file);
+end
 
 end

+stdlib/+native/get_permissions.m

@@ -2,10 +2,8 @@
 
 p = '';
 
-if ~stdlib.exists(file), return, end
-
-v = filePermissions(file);
-
-p = stdlib.native.perm2char(v, file);
+if stdlib.exists(file)
+  p = stdlib.native.perm2char(filePermissions(file), file);
+end
 
 end

+stdlib/+python/private/pvt_python_version.m

@@ -6,6 +6,9 @@
 vs = pe.Version;
 if stdlib.strempty(vs), return, end
 
+% this line may error like
+% "Python Error: TypeError: cannot create 'sys.version_info' instances"
+% if Python version incompatible or something got corrupted in loading Python library
 vi = py.sys.version_info;
 v = [double(vi.major), double(vi.minor), double(vi.micro)];
 

+stdlib/+python/version.m

@@ -15,13 +15,9 @@
   return
 end
 
-try
+% need to have no catch section as glitchy Python load can make TypeError etc.
+try %#ok<TRYNC>
   v = pvt_python_version();
-catch e
-  switch e.identifier
-    case {'Octave:undefined-function', 'MATLAB:Python:PythonUnavailable'}  % pass
-    otherwise, rethrow(e)
-  end
 end
 
 end

test/TestDisk.m

@@ -38,7 +38,7 @@ function test_disk_ac(tc, Ps, disk_ac_fun, disk_ac_name)
     tc.verifyEqual(r, uint64(0))
   end
 catch e
-  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError')
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
 end
 end
 
@@ -53,7 +53,7 @@ function test_hard_link_count(tc, hl_fun)
   r = h(P, hl_fun);
   tc.verifyGreaterThanOrEqual(r, 1)
 catch e
-  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError')
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
 end
 end
 
@@ -101,7 +101,7 @@ function test_inode_device(tc, id_fun, id_name)
     tc.verifyGreaterThan(ip, 0)
     tc.verifyEqual(h(".", id_fun), ip)
 catch e
-  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError')
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
 end
 
 end

test/TestExists.m

@@ -37,7 +37,7 @@ function test_is_rw(tc, Ps, method, fname)
   r = h(Ps{1}, method);
   tc.verifyEqual(r, Ps{2})
 catch e
-  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError')
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
 end
 end
 

test/TestPermissions.m

@@ -20,7 +20,7 @@ function test_get_permissions(tc, Ps, fname)
 try
   p = stdlib.get_permissions(Ps, fname);
 catch e
-  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError')
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
   return
 end
 tc.verifyClass(p, "char")
@@ -70,7 +70,7 @@ function test_set_permissions_nowrite(tc, fname)
 try
   tc.verifyTrue(stdlib.set_permissions(nw, 0, -1, 0, fname))
 catch e
-  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError')
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
   return
 end
 

test/TestSys.m

@@ -61,7 +61,7 @@ function test_cpu_load(tc, cpu_load_method)
   r = h(cpu_load_method);
   tc.verifyGreaterThanOrEqual(r, 0.)
 catch e
-  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError')
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
 end
 end