iris-pex-embedded-python 3.1.1b4__tar.gz → 3.1.1b5__tar.gz

{iris_pex_embedded_python-3.1.1b4/src/iris_pex_embedded_python.egg-info → iris_pex_embedded_python-3.1.1b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iris_pex_embedded_python
-Version: 3.1.1b4
+Version: 3.1.1b5
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License

{iris_pex_embedded_python-3.1.1b4 → iris_pex_embedded_python-3.1.1b5}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 
 [project]
 name = "iris_pex_embedded_python"
-version = "3.1.1b4"
+version = "3.1.1b5"
 description = "Iris Interoperability based on Embedded Python"
 readme = "README.md"
 authors = [

{iris_pex_embedded_python-3.1.1b4 → iris_pex_embedded_python-3.1.1b5}/src/iop/_utils.py

@@ -176,7 +176,7 @@ class _Utils():
         return module
 
     @staticmethod
-    def migrate(filename=None,root_path=None):
+    def migrate(filename=None):
         """ 
         Read the settings.py file and register all the components
         settings.py file has two dictionaries:
@@ -188,17 +188,23 @@ class _Utils():
                 * key: the name of the production
                 * value: a dictionary containing the settings for the production
         """
-        try:
-            # if the filename is not provided
-            if filename is None:
-                settings = importlib.import_module('settings')
+        path = None
+        # try to load the settings file
+        if filename:
+            # check if the filename is absolute or relative
+            if os.path.isabs(filename):
+                path = os.path.dirname(filename)
             else:
-                # import the settings file
-                settings = _Utils.import_module_from_path('settings',filename)
-            # get the path of the settings file
-            path = os.path.dirname(inspect.getfile(settings))
-        except ModuleNotFoundError as e:
-            raise ModuleNotFoundError("settings.py not found") from e
+                raise ValueError("The filename must be absolute")
+            # add the path to the system path to the beginning
+            sys.path.insert(0,os.path.normpath(path))
+            # import settings from the specified file
+            settings = _Utils.import_module_from_path('settings',filename)
+        else:
+            # import settings from the settings module
+            import settings
+        # get the path of the settings file
+        path = os.path.dirname(inspect.getfile(settings))
         try:
             # set the classes settings
             _Utils.set_classes_settings(settings.CLASSES,path)
@@ -209,15 +215,17 @@ class _Utils():
             _Utils.set_productions_settings(settings.PRODUCTIONS,path)
         except AttributeError:
             print("No productions to register")
+        try:
+            # remove the path from the system path (with or without the trailing slash)
+            sys.path.remove(path+'/')
+            sys.path.remove(path)
+        except ValueError:
+            pass
 
     @staticmethod
     def import_module_from_path(module_name, file_path):
         if not os.path.isabs(file_path):
-            file_path = os.path.abspath(file_path)
-        # check is a file is persent at the path
-        if not os.path.isfile(file_path):
-            # append settings.py to the path
-            file_path = os.path.join(file_path,'settings.py')
+            raise ValueError("The file path must be absolute")
         
         spec = importlib.util.spec_from_file_location(module_name, file_path)
         if spec is None:
@@ -225,6 +233,7 @@ class _Utils():
         
         module = importlib.util.module_from_spec(spec)
         sys.modules[module_name] = module
+        spec.loader.exec_module(module)
         return module
 
     @staticmethod

{iris_pex_embedded_python-3.1.1b4 → iris_pex_embedded_python-3.1.1b5}/src/iop/cls/IOP/Utils.cls

@@ -104,12 +104,10 @@ ClassMethod GetRemoteClassInfo(
 	pModule As %String,
 	pClasspaths As %String,
 	ByRef pClassDetails,
-	ByRef pRemoteSettings) As %Status [ Internal, Private ]
+	ByRef pRemoteSettings) As %Status [ Internal ]
 {
 	#dim tSC As %Status = $$$OK
 	#dim ex As %Exception.AbstractException
-	#dim tGateway As %External.Gateway
-	#dim tGatewayProxy As %Net.Remote.Object
 	
 	Try {
 		if pClasspaths '="" {
@@ -120,14 +118,19 @@ ClassMethod GetRemoteClassInfo(
 				set onePath = $p(extraClasspaths,"|",i)
 				set onePath = ##class(%File).NormalizeDirectory(onePath)
 				if onePath?1"$$IRISHOME"1P.E set onePath = $e($system.Util.InstallDirectory(),1,*-1)_$e(onePath,11,*)
-				if onePath'="" && '$FIND(sys.path,onePath) do sys.path.insert(0, onePath)
+				if onePath'="" do ##class(IOP.Common).SetPythonPath(onePath)
 			}
 		}
-		;
 
 		set importlib = ##class(%SYS.Python).Import("importlib")
 		set builtins = ##class(%SYS.Python).Import("builtins")
-		set module = importlib."import_module"(pModule)
+		set sys = ##class(%SYS.Python).Import("sys")
+		// Load the module form a specific path
+        set spec = importlib.util."spec_from_file_location"(pModule, onePath_pModule_".py")
+        set module = importlib.util."module_from_spec"(spec)
+        do sys.modules."__setitem__"(pModule, module)
+        do spec.loader."exec_module"(module)
+		// Get the class
 		set class = builtins.getattr(module, pRemoteClassname)
 		set tClass = class."__new__"(class)
 

{iris_pex_embedded_python-3.1.1b4 → iris_pex_embedded_python-3.1.1b5/src/iris_pex_embedded_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iris_pex_embedded_python
-Version: 3.1.1b4
+Version: 3.1.1b5
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License