iris-pex-embedded-python 3.7.1b2__tar.gz → 3.7.1b4__tar.gz

{iris_pex_embedded_python-3.7.1b2/src/iris_pex_embedded_python.egg-info → iris_pex_embedded_python-3.7.1b4}/PKG-INFO

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

{iris_pex_embedded_python-3.7.1b2 → iris_pex_embedded_python-3.7.1b4}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 
 [project]
 name = "iris_pex_embedded_python"
-version = "3.7.1b2"
+version = "3.7.1b4"
 description = "Iris Interoperability based on Embedded Python"
 readme = "README.md"
 requires-python = ">=3.10"

{iris_pex_embedded_python-3.7.1b2 → iris_pex_embedded_python-3.7.1b4}/src/iop/_dispatch.py

@@ -116,13 +116,25 @@ def create_dispatch(host: Any) -> None:
     The dispatch table consists of tuples of (fully_qualified_class_name, method_name).
     Only methods that take a single typed parameter are considered as handlers.
     """
-    if len(host.DISPATCH) > 0:
-        return
+    dispatch = _declared_dispatch(host)
 
     for method_name in get_callable_methods(host):
         handler_info = get_handler_info(host, method_name)
-        if handler_info:
-            host.DISPATCH.append(handler_info)
+        if handler_info and handler_info not in dispatch:
+            dispatch.append(handler_info)
+
+    host.DISPATCH = dispatch
+
+
+def _declared_dispatch(host: Any) -> List[Tuple[str, str]]:
+    if "DISPATCH" in getattr(host, "__dict__", {}):
+        return list(host.__dict__["DISPATCH"])
+
+    class_dispatch = host.__class__.__dict__.get("DISPATCH")
+    if class_dispatch is not None:
+        return list(class_dispatch)
+
+    return []
 
 
 def get_callable_methods(host: Any) -> List[str]:

{iris_pex_embedded_python-3.7.1b2 → iris_pex_embedded_python-3.7.1b4}/src/iop/_persistent_message.py

@@ -299,8 +299,10 @@ def load_python_class(
     except ModuleNotFoundError as exc:
         if not python_classpath or not _is_missing_target_module(exc, module_name):
             raise
-        _prepend_sys_path(python_classpath)
-        module = importlib.import_module(module_name)
+        module = _import_module_from_classpath(module_name, python_classpath)
+    else:
+        if python_classpath and not hasattr(module, class_name):
+            module = _import_module_from_classpath(module_name, python_classpath)
     return getattr(module, class_name)
 
 
@@ -529,3 +531,10 @@ def _prepend_sys_path(path: str) -> None:
     while normalized_path in sys.path:
         sys.path.remove(normalized_path)
     sys.path.insert(0, normalized_path)
+    importlib.invalidate_caches()
+
+
+def _import_module_from_classpath(module_name: str, python_classpath: str):
+    _prepend_sys_path(python_classpath)
+    sys.modules.pop(module_name, None)
+    return importlib.import_module(module_name)

{iris_pex_embedded_python-3.7.1b2 → iris_pex_embedded_python-3.7.1b4/src/iris_pex_embedded_python.egg-info}/PKG-INFO

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