Work on probe API

Thrameos · Thrameos · commit 79ac9e42a3f3 · 2025-04-22T08:11:34.000-07:00
diff --git a/jpype/_core.py b/jpype/_core.py
@@ -22,6 +22,7 @@
 from pathlib import Path
 import sys
 import typing
+import weakref
 
 import _jpype
 from . import types as _jtypes
@@ -600,3 +601,14 @@ def removeShutdownHook(self, thread):
 
 
 _jpype.JVMNotRunning = JVMNotRunning
+
+# Dictionary of Python types to Java Interfaces
+_jpype._bridge_concrete = {}
+# Dictionary of String to Java Interfaces
+_jpype._bridge_protocol = {}
+# Dictionary of Type to Tuple(Interface[], Dict)
+_jpype._bridge_cache = weakref.WeakKeyDictionary()
+# Dictionary of Tuple(Interface[]) to Tuple(Interface[])
+_jpype._bridge_interfaces = {}
+# Dictionary of Tuple(Interface[]) to Dict
+_jpype._bridge_methods = {}
diff --git a/native/jpype_module/src/main/java/python/exception/PyADirectionError.java b/native/jpype_module/src/main/java/python/exception/PyADirectionError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyADirectionError extends PyOSError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyArithmeticError.java b/native/jpype_module/src/main/java/python/exception/PyArithmeticError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyArithmeticError extends PyException
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyAssertionError.java b/native/jpype_module/src/main/java/python/exception/PyAssertionError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyAssertionError extends PyException
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyAttributeError.java b/native/jpype_module/src/main/java/python/exception/PyAttributeError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyAttributeError extends PyException
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyBlockingIOError.java b/native/jpype_module/src/main/java/python/exception/PyBlockingIOError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyBlockingIOError extends PyOSError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyBufferError.java b/native/jpype_module/src/main/java/python/exception/PyBufferError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyBufferError extends PyException
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyChildProcessError.java b/native/jpype_module/src/main/java/python/exception/PyChildProcessError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyChildProcessError extends PyOSError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyConnectionError.java b/native/jpype_module/src/main/java/python/exception/PyConnectionError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyConnectionError extends PyOSError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyEOFError.java b/native/jpype_module/src/main/java/python/exception/PyEOFError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyEOFError extends PyException
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyExc.java b/native/jpype_module/src/main/java/python/exception/PyExc.java
diff --git a/native/jpype_module/src/main/java/python/exception/PyException.java b/native/jpype_module/src/main/java/python/exception/PyException.java
@@ -16,6 +16,7 @@
 package python.exception;
 
 import java.util.HashMap;
+import python.lang.PyExc;
 
 /**
  *
diff --git a/native/jpype_module/src/main/java/python/exception/PyFileExistsError.java b/native/jpype_module/src/main/java/python/exception/PyFileExistsError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyFileExistsError extends PyOSError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyFileNotFoundError.java b/native/jpype_module/src/main/java/python/exception/PyFileNotFoundError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyFileNotFoundError extends PyOSError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyFloatingPointError.java b/native/jpype_module/src/main/java/python/exception/PyFloatingPointError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyFloatingPointError extends PyArithmeticError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyImportError.java b/native/jpype_module/src/main/java/python/exception/PyImportError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyImportError extends PyException
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyIndentationError.java b/native/jpype_module/src/main/java/python/exception/PyIndentationError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyIndentationError extends PySyntaxError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyIndexError.java b/native/jpype_module/src/main/java/python/exception/PyIndexError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyIndexError extends PyLookupError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyInterruptedError.java b/native/jpype_module/src/main/java/python/exception/PyInterruptedError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyInterruptedError extends PyOSError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyKeyError.java b/native/jpype_module/src/main/java/python/exception/PyKeyError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyKeyError extends PyLookupError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyLookupError.java b/native/jpype_module/src/main/java/python/exception/PyLookupError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyLookupError extends PyException
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyModuleNotFoundError.java b/native/jpype_module/src/main/java/python/exception/PyModuleNotFoundError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyModuleNotFoundError extends PyImportError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyNameError.java b/native/jpype_module/src/main/java/python/exception/PyNameError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyNameError extends PyException
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyNotADirectoryError.java b/native/jpype_module/src/main/java/python/exception/PyNotADirectoryError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyNotADirectoryError extends PyOSError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyNotImplementedError.java b/native/jpype_module/src/main/java/python/exception/PyNotImplementedError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyNotImplementedError extends PyRuntimeError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyOSError.java b/native/jpype_module/src/main/java/python/exception/PyOSError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyOSError extends PyException
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyOverflowError.java b/native/jpype_module/src/main/java/python/exception/PyOverflowError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyOverflowError extends PyArithmeticError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyPermissionError.java b/native/jpype_module/src/main/java/python/exception/PyPermissionError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyPermissionError extends PyOSError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyProcessLookupError.java b/native/jpype_module/src/main/java/python/exception/PyProcessLookupError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyProcessLookupError extends PyOSError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyRecursionError.java b/native/jpype_module/src/main/java/python/exception/PyRecursionError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyRecursionError extends PyRuntimeError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyReferenceError.java b/native/jpype_module/src/main/java/python/exception/PyReferenceError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyReferenceError extends PyException
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyRuntimeError.java b/native/jpype_module/src/main/java/python/exception/PyRuntimeError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyRuntimeError extends PyException
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PySyntaxError.java b/native/jpype_module/src/main/java/python/exception/PySyntaxError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PySyntaxError extends PyException
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PySystemError.java b/native/jpype_module/src/main/java/python/exception/PySystemError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PySystemError extends PyException
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyTimeoutError.java b/native/jpype_module/src/main/java/python/exception/PyTimeoutError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyTimeoutError extends PyOSError
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyTypeError.java b/native/jpype_module/src/main/java/python/exception/PyTypeError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyTypeError extends PyException
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyWarning.java b/native/jpype_module/src/main/java/python/exception/PyWarning.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyWarning extends PyException
 {
 
diff --git a/native/jpype_module/src/main/java/python/exception/PyZeroDivisionError.java b/native/jpype_module/src/main/java/python/exception/PyZeroDivisionError.java
@@ -1,5 +1,7 @@
 package python.exception;
 
+import python.lang.PyExc;
+
 public class PyZeroDivisionError extends PyArithmeticError
 {
 
diff --git a/native/python/pyjp_module.cpp b/native/python/pyjp_module.cpp
diff --git a/test_probe.py b/test_probe.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`package python.exception;`
`2`	`2`
	`3`	`+import python.lang.PyExc;`
	`4`	`+`
`3`	`5`	`public class PyADirectionError extends PyOSError`
`4`	`6`	`{`
`5`	`7`