Use _utils module to get matlab paths information

Author: t20100

src/matlab/__init__.py

@@ -4,6 +4,7 @@
 import platform
 import sys
 import pkgutil
+from . import _utils
 
 __path__ = pkgutil.extend_path(__path__, __name__)
 package_folder = os.path.dirname(os.path.realpath(__file__))
@@ -35,13 +36,7 @@ def add_dirs_to_path(bin_dir, engine_dir, extern_dir):
         sys.path.insert(0, engine_dir)
         sys.path.insert(0, extern_dir)
 
-arch_file = os.path.join(package_folder, 'engine', '_arch.txt')
-if not os.path.isfile(arch_file):
-    raise RuntimeError("The MATLAB Engine for Python install is corrupted. Please try to re-install.")
-
-with open(arch_file, 'r') as root:
-    [arch, bin_folder, engine_folder, extern_bin] = [line.strip() for line in root.readlines()]
-
+arch, bin_folder, engine_folder, extern_bin = _utils.get_path_info()
 
 add_dirs_to_path(bin_folder, engine_folder, extern_bin)
 

src/matlab/engine/__init__.py

@@ -27,6 +27,8 @@
 import threading
 import warnings
 
+from .. import _utils
+
 # UPDATE_IF_PYTHON_VERSION_ADDED_OR_REMOVED : search for this string in codebase 
 # when support for a Python version must be added or removed
 
@@ -50,8 +52,6 @@
                         'is %s' % _version)
 
 
-_module_folder = os.path.dirname(os.path.realpath(__file__))
-_arch_filename = os.path.join(_module_folder, "_arch.txt")
 success = False 
 firstExceptionMessage = ''
 secondExceptionMessage = ''
@@ -65,21 +65,14 @@
 
 if firstExceptionMessage:
     try:
-        _arch_file = open(_arch_filename,'r')
-        _lines = _arch_file.readlines()
-        [_arch, _bin_dir,_engine_dir, _extern_bin_dir] = [x.rstrip() for x in _lines if x.rstrip() != ""]
-        _arch_file.close()
-        sys.path.insert(0,_engine_dir)
-        sys.path.insert(0,_extern_bin_dir)
-
         _envs = {'win32': 'PATH', 'win64': 'PATH'}
-        if _arch in _envs:
-            if _envs[_arch] in os.environ:
-                _env = os.environ[_envs[_arch]]
-                os.environ[_envs[_arch]] = _bin_dir + os.pathsep + os.environ[_envs[_arch]]
+        _path_info = _utils.get_path_info()
+        if _path_info.arch in _envs:
+            if _envs[_path_info.arch] in os.environ:
+                os.environ[_envs[_path_info.arch]] = _path_info.bin_folder + os.pathsep + os.environ[_envs[_path_info.arch]]
             else:
-                os.environ[_envs[_arch]] = _bin_dir
-            os.add_dll_directory(_bin_dir)
+                os.environ[_envs[_path_info.arch]] = _path_info.bin_folder
+            os.add_dll_directory(_path_info.bin_folder)
         if _PYTHONVERSION != '3_9' or _PYTHONVERSION != '3_10':
             pythonengine = importlib.import_module("matlabengineforpython_abi3")
         else: