iris-pex-embedded-python 3.1.1b7__py3-none-any.whl → 3.1.2b1__py3-none-any.whl

iop/cls/IOP/Utils.cls

@@ -125,16 +125,24 @@ ClassMethod GetRemoteClassInfo(
 		set importlib = ##class(%SYS.Python).Import("importlib")
 		set builtins = ##class(%SYS.Python).Import("builtins")
 		set sys = ##class(%SYS.Python).Import("sys")
+		set os = ##class(%SYS.Python).Import("os")
 		// 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)
+		// Guess the full path to the module
+		set path = ..GuessFullPath(pModule, onePath)
+		Try {
+			set spec = importlib.util."spec_from_file_location"(pModule, path)
+			set module = importlib.util."module_from_spec"(spec)
+			do sys.modules."__setitem__"(pModule, module)
+			do spec.loader."exec_module"(module)
+		}
+		Catch ex {
+			set module = importlib."import_module"(pModule)
+		}
+
 		// Get the class
 		set class = builtins.getattr(module, pRemoteClassname)
 		set tClass = class."__new__"(class)
 
-
 		If $IsObject(tClass) {
 			#; List of information about the class as a whole - $lb(SuperClass, Description, InfoURL, IconURL, Adapter)
 			Set pClassDetails = tClass."_get_info"()
@@ -152,13 +160,21 @@ ClassMethod GetRemoteClassInfo(
 	Quit tSC
 }
 
-/// Set tConnectionSettings("Classpaths") = pCLASSPATHS
-/// Set tConnectionSettings("Module") = pModule
-/// Set tConnectionSettings("Classname") = pRemoteClassname
-/// Set:(""=pProxyClassname) pProxyClassname = pRemoteClassname
-/// 
-/// Set tSC = ..GenerateProxyClass(pProxyClassname,.tConnectionSettings,tClassDetails,tRemoteSettings,pOverwrite)
-/// "bo","Duplex","/irisdev/app/src/python/demo/duplex/",1,"Duplex.Duplex"
+ClassMethod GuessFullPath(
+	module As %String,
+	path As %String) As %String
+{
+    If $Find(module, ".") {
+        Set module = $Piece(module, ".", *)
+    }
+    If $Find(path, module) {
+        Set path = $Piece(path, module, 1)
+    }
+    // append the module to the path
+    Set path = path _ module _ ".py"
+    Return path
+}
+
 ClassMethod GenerateProxyClass(
 	pClassname As %String,
 	ByRef pConnectionSettings,

{iris_pex_embedded_python-3.1.1b7.dist-info → iris_pex_embedded_python-3.1.2b1.dist-info}/METADATA

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

{iris_pex_embedded_python-3.1.1b7.dist-info → iris_pex_embedded_python-3.1.2b1.dist-info}/RECORD

@@ -116,7 +116,7 @@ iop/cls/IOP/Message.cls,sha256=n0r0FslXdDfPcHIiAlW7n596DDsDSNlTX8UTPaMnSV8,9911
 iop/cls/IOP/OutboundAdapter.cls,sha256=9eOwy5ojwcTzwrHs6LNrFQvUD8aqcoNCZrILN1ycdDM,958
 iop/cls/IOP/PickleMessage.cls,sha256=S3y7AClQ8mAILjxPuHdCjGosBZYzGbUQ5WTv4mYPNMQ,1673
 iop/cls/IOP/Test.cls,sha256=gAC9PEfMZsvAEWIa241-ug2FWAhITbN1SOispZzJPnI,2094
-iop/cls/IOP/Utils.cls,sha256=UgSEH2gqiNKYK_NAc2QUXF0A0VXHK-vbwWsHplHV2T8,13994
+iop/cls/IOP/Utils.cls,sha256=1fkb3ff-FhRRx5nIqPUzj7sndlo0ptHfOvMoC4bw0eY,14073
 iop/cls/IOP/Duplex/Operation.cls,sha256=K_fmgeLjPZQbHgNrc0kd6DUQoW0fDn1VHQjJxHo95Zk,525
 iop/cls/IOP/Duplex/Process.cls,sha256=xbefZ4z84a_IUhavWN6P_gZBzqkdJ5XRTXxro6iDvAg,6986
 iop/cls/IOP/Duplex/Service.cls,sha256=sTMOQUCMBgVitmQkM8bbsrmrRtCdj91VlctJ3I7b8WU,161
@@ -135,9 +135,9 @@ iris/iris_ipm.pyi,sha256=j7CNUZcjeDu5sgeWUZJO_Qi4vQmHh6aD-jPWv8OdoUs,374
 iris/iris_utils.py,sha256=kg80O3yRpHIutM-mCyr4xCeTvKWPE-Kai-b6Dxw4vQ4,9882
 irisnative/_IRISNative.py,sha256=HQ4nBhc8t8_5OtxdMG-kx1aa-T1znf2I8obZOPLOPzg,665
 irisnative/__init__.py,sha256=6YmvBLQSURsCPKaNg7LK-xpo4ipDjrlhKuwdfdNb3Kg,341
-iris_pex_embedded_python-3.1.1b7.dist-info/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
-iris_pex_embedded_python-3.1.1b7.dist-info/METADATA,sha256=-epE6C4-AGz-o93Vh3xX2rRDUoN1wToTM121HiKWm68,50122
-iris_pex_embedded_python-3.1.1b7.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
-iris_pex_embedded_python-3.1.1b7.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
-iris_pex_embedded_python-3.1.1b7.dist-info/top_level.txt,sha256=jkWtvFKOp1Q-uO_VpGpfx5TcW7DS39z1liOAVp6zLig,47
-iris_pex_embedded_python-3.1.1b7.dist-info/RECORD,,
+iris_pex_embedded_python-3.1.2b1.dist-info/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
+iris_pex_embedded_python-3.1.2b1.dist-info/METADATA,sha256=rEj2oBw5yxW16dG9w6zJrUUYr1_Kf5-1FXdou5hbf0M,50122
+iris_pex_embedded_python-3.1.2b1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+iris_pex_embedded_python-3.1.2b1.dist-info/entry_points.txt,sha256=pj-i4LSDyiSP6xpHlVjMCbg1Pik7dC3_sdGY3Yp9Vhk,38
+iris_pex_embedded_python-3.1.2b1.dist-info/top_level.txt,sha256=jkWtvFKOp1Q-uO_VpGpfx5TcW7DS39z1liOAVp6zLig,47
+iris_pex_embedded_python-3.1.2b1.dist-info/RECORD,,

{iris_pex_embedded_python-3.1.1b7.dist-info → iris_pex_embedded_python-3.1.2b1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.1)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any