Testing updates

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.5.2.dev0
+current_version = 1.6.0.dev0
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<build>\d+))?

doc/CHANGELOG.rst

@@ -4,7 +4,13 @@ Changelog
 This changelog *only* contains changes from the *first* pypi release (0.5.4.3) onwards.
 
 Latest Changes:
-- **1.5.2.dev0 - 2024-11-18**
+- **1.6.0.dev0 - 2025-01-20**
+
+  - JArray is now registered as a Sequence.
+
+  - Fixed bugs with java.util.List concat and repeat methods.
+
+- **1.5.2 - 2025-01-20**
 
   - Roll back agent change due to misbehaving JVM installs.
 

jpype/__init__.py

@@ -52,7 +52,7 @@
 __all__.extend(_jcustomizer.__all__)  # type: ignore[name-defined]
 __all__.extend(_gui.__all__)  # type: ignore[name-defined]
 
-__version__ = "1.5.2.dev0"
+__version__ = "1.6.0.dev0"
 __version_info__ = __version__.split('.')
 
 

jpype/_core.py

@@ -563,17 +563,17 @@ def synchronized(obj):
     return _jpype._JMonitor(obj)
 
 
-def getJVMVersion():
+def getJVMVersion() -> tuple[int, int, int]:
     """ Get the JVM version if the JVM is started.
 
     This function can be used to determine the version of the JVM. It is
     useful to help determine why a Jar has failed to load.
 
     Returns:
-      A typle with the (major, minor, revison) of the JVM if running.
+      A tuple with the (major, minor, revision) of the JVM if running.
     """
     if not _jpype.isStarted():
-        return (0, 0, 0)
+        return 0, 0, 0
 
     import re
     runtime = _jpype.JClass('java.lang.Runtime')

jpype/_jarray.py

@@ -17,6 +17,7 @@
 # *****************************************************************************
 import _jpype
 from . import _jcustomizer
+from collections.abc import Sequence
 
 
 __all__ = ['JArray']
@@ -216,3 +217,4 @@ def __eq__(self, other):
 # Install module hooks
 _jcustomizer._applyCustomizerPost(_jpype._JArray, _JArrayProto)
 _jpype.JArray = JArray
+Sequence.register(_jpype._JArray)

jpype/_jcollection.py

@@ -162,10 +162,16 @@ def __iadd__(self, obj):
         return self
 
     def __add__(self, obj):
-        new = self.clone()
+        new = _jpype.JClass("java.util.ArrayList")(self)
         new.extend(obj)
         return new
 
+    def __mul__(self, obj):
+        new = _jpype.JClass("java.util.ArrayList")()
+        for i in range(obj):
+            new.extend(self)
+        return new
+
     @JOverride(sticky=True, rename='remove_')
     def remove(self, obj):
         try:

jpype/_jvmfinder.py

@@ -99,7 +99,7 @@ def find_libjvm(self, java_home):
         found_non_supported_jvm = False
 
         # Look for the file
-        for root, _, names in os.walk(java_home):
+        for root, _, names in sorted(os.walk(java_home), key=lambda t: len(t[0].split(os.sep))):
             if self._libfile in names:
                 # Found it, but check for non supported jvms
                 candidate = os.path.split(root)[1]

native/common/jp_context.cpp

@@ -119,38 +119,52 @@ void JPContext::startJVM(const string& vmPath, const StringVector& args,
 		throw;
 	}
 
+	// Determine the memory requirements
+#define PAD(x) ((x+31)&~31)
+	size_t mem = PAD(sizeof(JavaVMInitArgs));
+	size_t oblock = mem;
+	mem += PAD(sizeof(JavaVMOption)*args.size() + 1);
+	size_t sblock = mem;
+	for (size_t i = 0; i < args.size(); i++)
+	{
+		mem += PAD(args[i].size()+1);
+	}
+
 	// Pack the arguments
 	JP_TRACE("Pack arguments");
-	JavaVMInitArgs jniArgs;
-	jniArgs.options = nullptr;
+	char *block = (char*) malloc(mem);
+	JavaVMInitArgs* jniArgs = (JavaVMInitArgs*) block;
+	memset(jniArgs, 0, mem);
+	jniArgs->options = (JavaVMOption*)(&block[oblock]);
 
 	// prepare this ...
-	jniArgs.version = USE_JNI_VERSION;
-	jniArgs.ignoreUnrecognized = ignoreUnrecognized;
+	jniArgs->version = USE_JNI_VERSION;
+	jniArgs->ignoreUnrecognized = ignoreUnrecognized;
 	JP_TRACE("IgnoreUnrecognized", ignoreUnrecognized);
 
-	jniArgs.nOptions = (jint) args.size();
-	JP_TRACE("NumOptions", jniArgs.nOptions);
-	jniArgs.options = new JavaVMOption[jniArgs.nOptions];
-	memset(jniArgs.options, 0, sizeof (JavaVMOption) * jniArgs.nOptions);
-	for (int i = 0; i < jniArgs.nOptions; i++)
+	jniArgs->nOptions = (jint) args.size();
+	JP_TRACE("NumOptions", jniArgs->nOptions);
+	size_t j = sblock;
+	for (size_t i = 0; i < args.size(); i++)
 	{
 		JP_TRACE("Option", args[i]);
-		jniArgs.options[i].optionString = (char*) args[i].c_str();
+		strncpy(&block[j], args[i].c_str(), args[i].size());
+		jniArgs->options[i].optionString = (char*) &block[j];
+		j += PAD(args[i].size()+1);
 	}
 
 	// Launch the JVM
 	JNIEnv* env = nullptr;
 	JP_TRACE("Create JVM");
 	try
 	{
-		CreateJVM_Method(&m_JavaVM, (void**) &env, (void*) &jniArgs);
+		CreateJVM_Method(&m_JavaVM, (void**) &env, (void*) jniArgs);
 	} catch (...)
 	{
 		JP_TRACE("Exception in CreateJVM?");
 	}
 	JP_TRACE("JVM created");
-	delete [] jniArgs.options;
+	free(jniArgs);
 
 	if (m_JavaVM == nullptr)
 	{
@@ -489,10 +503,14 @@ extern "C" JNIEXPORT void JNICALL Java_org_jpype_JPypeContext_onShutdown
 
 static int interruptState = 0;
 extern "C" JNIEXPORT void JNICALL Java_org_jpype_JPypeSignal_interruptPy
-(JNIEnv *env, jclass cls)
+(JNIEnv *env, jclass cls, jint signal)
 {
 	interruptState = 1;
+#if PY_MINOR_VERSION<10
 	PyErr_SetInterrupt();
+#else
+	PyErr_SetInterruptEx((int) signal);
+#endif
 }
 
 extern "C" JNIEXPORT void JNICALL Java_org_jpype_JPypeSignal_acknowledgePy

native/java/org/jpype/JPypeContext.java

@@ -70,7 +70,7 @@
 public class JPypeContext
 {
 
-  public final String VERSION = "1.5.2.dev0";
+  public final String VERSION = "1.6.0.dev0";
 
   private static final JPypeContext INSTANCE = new JPypeContext();
   // This is the C++ portion of the context.

native/java/org/jpype/JPypeSignal.java

@@ -15,7 +15,6 @@
 **************************************************************************** */
 package org.jpype;
 
-import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -31,6 +30,17 @@ public class JPypeSignal
 
   static Thread main;
 
+  static Object getSignalHandler(Class signalHandlerClazz, int signal) throws ClassNotFoundException {
+    return Proxy.newProxyInstance(ClassLoader.getSystemClassLoader(), new Class[]
+            {
+                    signalHandlerClazz
+            }, (proxy, method, args) -> {
+              main.interrupt();
+              interruptPy(signal);
+              return null;
+            });
+  }
+
   static void installHandlers()
   {
     try
@@ -39,28 +49,17 @@ static void installHandlers()
       Class SignalHandler = Class.forName("sun.misc.SignalHandler");
       main = Thread.currentThread();
       Method method = Signal.getMethod("handle", Signal, SignalHandler);
-
-      Object handler = Proxy.newProxyInstance(ClassLoader.getSystemClassLoader(), new Class[]
-      {
-        SignalHandler
-      }, new InvocationHandler()
-      {
-        @Override
-        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
-        {
-          main.interrupt();
-          interruptPy();
-          return null;
-        }
-      });
       Object intr = Signal.getDeclaredConstructor(String.class).newInstance("INT");
-      method.invoke(null, intr, handler);
+      method.invoke(null, intr, getSignalHandler(SignalHandler, 2));
+      Object intrTerm = Signal.getDeclaredConstructor(String.class).newInstance("TERM");
+      method.invoke(null, intrTerm, getSignalHandler(SignalHandler, 15));
     } catch (InvocationTargetException | IllegalArgumentException | IllegalAccessException | InstantiationException | ClassNotFoundException | NoSuchMethodException | SecurityException ex)
     {
       // If we don't get the signal handler run without it.  (ANDROID)
     }
   }
 
-  native static void interruptPy();
+  native static void interruptPy(int signal);
+
   native static void acknowledgePy();
 }

native/python/pyjp_module.cpp

@@ -761,7 +761,7 @@ PyMODINIT_FUNC PyInit__jpype()
 #ifdef Py_GIL_DISABLED
     PyUnstable_Module_SetGIL(module, Py_MOD_GIL_NOT_USED);
 #endif
-	PyModule_AddStringConstant(module, "__version__", "1.5.2.dev0");
+	PyModule_AddStringConstant(module, "__version__", "1.6.0.dev0");
 
 	// Our module will be used for PyFrame object and it is a requirement that
 	// we have a builtins in our dictionary.

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jpype1"
-version = '1.5.2.dev0'
+version = '1.6.0.dev0'
 authors = [
     {name = "Steve Menard", email = "devilwolf@users.sourceforge.net"},
 ]

test/harness/java8/jpype/lambda/Test1.java → test/harness/java8/jpype/test/lambda/Test1.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.lambda;
+package jpype.test.lambda;
 
 import java.util.function.Function;
 

test/harness/java9/jpype/method/Caller.java → test/harness/java9/jpype/test/method/Caller.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.method;
+package jpype.test.method;
 
 import jdk.internal.reflect.CallerSensitive;
 

test/harness/jpype/array/Test2.java → test/harness/jpype/test/array/Test2.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.array;
+package jpype.test.array;
 
 public class Test2
 {

test/harness/jpype/array/TestArray.java → test/harness/jpype/test/array/TestArray.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.array;
+package jpype.test.array;
 
 public class TestArray
 {

test/harness/jpype/attr/ClassWithBuffer.java → test/harness/jpype/test/attr/ClassWithBuffer.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package jpype.test.attr;
 
 import java.awt.image.BufferStrategy;
 

test/harness/jpype/attr/Holder.java → test/harness/jpype/test/attr/Holder.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package jpype.test.attr;
 
 public class Holder
 {

test/harness/jpype/attr/SubHolder.java → test/harness/jpype/test/attr/SubHolder.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package jpype.test.attr;
 
 public class SubHolder extends Holder implements java.io.Serializable
 {

test/harness/jpype/attr/SyntheticMethods.java → test/harness/jpype/test/attr/SyntheticMethods.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package jpype.test.attr;
 
 import java.util.List;
 

test/harness/jpype/attr/Test1.java → test/harness/jpype/test/attr/Test1.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package jpype.test.attr;
 
 public class Test1
 {

test/harness/jpype/attr/Test2.java → test/harness/jpype/test/attr/Test2.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package jpype.test.attr;
 
 public class Test2 extends Test1
 {

test/harness/jpype/attr/TestKeywords.java → test/harness/jpype/test/attr/TestKeywords.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package jpype.test.attr;
 
 public class TestKeywords
 {

test/harness/jpype/attr/TestOverloadA.java → test/harness/jpype/test/attr/TestOverloadA.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package jpype.test.attr;
 
 public class TestOverloadA
 {

test/harness/jpype/attr/TestOverloadB.java → test/harness/jpype/test/attr/TestOverloadB.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package jpype.test.attr;
 
 public class TestOverloadB extends TestOverloadA
 {

test/harness/jpype/attr/TestOverloadC.java → test/harness/jpype/test/attr/TestOverloadC.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.attr;
+package jpype.test.attr;
 
 public class TestOverloadC extends TestOverloadB
 {

test/harness/jpype/boxed/Boxed.java → test/harness/jpype/test/boxed/Boxed.java

@@ -13,7 +13,7 @@
 
   See NOTICE file for details.
 **************************************************************************** */
-package jpype.boxed;
+package jpype.test.boxed;
 
 public class Boxed
 {