Remove python long to support Cython >= 3.1.x

jnius/jnius_conversion.pxi

@@ -38,7 +38,6 @@ cdef void populate_args(JNIEnv *j_env, tuple definition_args, jvalue *j_args, ar
     cdef JavaClass jc
     cdef PythonJavaClass pc
     cdef int index
-    from ctypes import c_long as long
 
     for index, argtype in enumerate(definition_args):
         py_arg = args[index]
@@ -63,7 +62,7 @@ cdef void populate_args(JNIEnv *j_env, tuple definition_args, jvalue *j_args, ar
                 j_args[index].l = NULL
 
             # numeric types
-            elif isinstance(py_arg, (int, long)):
+            elif isinstance(py_arg, int):
                 j_args[index].l = convert_python_to_jobject(
                     j_env, 'Ljava/lang/Integer;', py_arg
                 )
@@ -468,7 +467,6 @@ cdef jobject convert_python_to_jobject(JNIEnv *j_env, definition, obj) except *:
     cdef JavaClassStorage jcs
     cdef PythonJavaClass pc
     cdef int index
-    from ctypes import c_long as long
 
     if definition[0] == 'V':
         return NULL
@@ -481,7 +479,7 @@ cdef jobject convert_python_to_jobject(JNIEnv *j_env, definition, obj) except *:
             return convert_pystr_to_java(j_env, to_unicode(obj))
 
         # numeric types
-        elif isinstance(obj, (int, long)) and \
+        elif isinstance(obj, int) and \
                 definition in (
                     'Ljava/lang/Integer;',
                     'Ljava/lang/Number;',
@@ -543,7 +541,6 @@ cdef jobject convert_python_to_jobject(JNIEnv *j_env, definition, obj) except *:
         conversions = {
             int: 'I',
             bool: 'Z',
-            long: 'J',
             float: 'F',
             unicode: 'Ljava/lang/String;',
             bytes: 'B'
@@ -634,7 +631,6 @@ cdef jobject convert_pyarray_to_java(JNIEnv *j_env, definition, pyarray) except
     cdef jclass j_class
     cdef JavaObject jo
     cdef JavaClass jc
-    from ctypes import c_long as long
 
     cdef ByteArray a_bytes
 
@@ -644,7 +640,6 @@ cdef jobject convert_pyarray_to_java(JNIEnv *j_env, definition, pyarray) except
         conversions = {
             int: 'I',
             bool: 'Z',
-            long: 'J',
             float: 'F',
             bytes: 'B',
             str: 'Ljava/lang/String;',

jnius/jnius_export_class.pxi

@@ -292,6 +292,7 @@ cdef class JavaClass(object):
         cdef jmethodID constructor = NULL
         cdef JNIEnv *j_env = get_jnienv()
         cdef list found_definitions = []
+        debug = kwargs.get("debug", False)
 
         # get the constructor definition if exist
         definitions = [('()V', False)]
@@ -357,6 +358,9 @@ cdef class JavaClass(object):
                 )
             scores.sort()
             score, definition, d_ret, d_args, args_ = scores[-1]
+            if debug:
+                print(scores)
+                print("Selected %s for invocation" % definition)
 
         try:
             # convert python arguments to java arguments
@@ -1131,6 +1135,7 @@ cdef class JavaMultipleMethod(object):
         cdef dict methods
         cdef int max_sign_args
         cdef list found_signatures = []
+        debug = kwargs.get("debug", False)
 
         if self.j_self:
             methods = self.instance_methods
@@ -1166,6 +1171,9 @@ cdef class JavaMultipleMethod(object):
             )
         scores.sort()
         score, signature = scores[-1]
+        if debug:
+            print(scores)
+            print("Selected %s for invocation" % signature)
 
         jm = methods[signature]
         jm.j_self = self.j_self

jnius/jnius_utils.pxi

@@ -278,7 +278,6 @@ cdef int calculate_score(sign_args, args, is_varargs=False) except *:
     cdef JavaClass jc
     cdef int args_len = len(args)
     cdef int sign_args_len = len(sign_args)
-    from ctypes import c_long as long
 
     if args_len != sign_args_len and not is_varargs:
         # if the number of arguments expected is not the same
@@ -301,27 +300,26 @@ cdef int calculate_score(sign_args, args, is_varargs=False) except *:
         r = sign_args[index]
         arg = args[index]
 
-        if r == 'Z':
+        if r == 'Z': # boolean
             if not isinstance(arg, bool):
                 return -1
             score += 10
             continue
 
-        if r == 'B':
+        if r == 'B': # byte
             if not isinstance(arg, int):
                 return -1
             score += 10
             continue
 
-        if r == 'C':
+        if r == 'C': # char
             if not isinstance(arg, str) or len(arg) != 1:
                 return -1
             score += 10
             continue
 
-        if r == 'S' or r == 'I':
-            if isinstance(arg, int) or (
-                    (isinstance(arg, long) and arg < 2147483648)):
+        if r == 'S': # short
+            if isinstance(arg, int) and arg <= 32767 and arg >= -32768:
                 score += 10
                 continue
             elif isinstance(arg, float):
@@ -330,8 +328,8 @@ cdef int calculate_score(sign_args, args, is_varargs=False) except *:
             else:
                 return -1
 
-        if r == 'J':
-            if isinstance(arg, int) or isinstance(arg, long):
+        if r == 'I': # int
+            if isinstance(arg, int) and arg <= 2147483647 and arg >= -2147483648:
                 score += 10
                 continue
             elif isinstance(arg, float):
@@ -340,7 +338,17 @@ cdef int calculate_score(sign_args, args, is_varargs=False) except *:
             else:
                 return -1
 
-        if r == 'F' or r == 'D':
+        if r == 'J': # long
+            if isinstance(arg, int):
+                score += 10
+                continue
+            elif isinstance(arg, float):
+                score += 5
+                continue
+            else:
+                return -1
+
+        if r == 'F' or r == 'D': # float or double
             if isinstance(arg, int):
                 score += 5
                 continue
@@ -350,7 +358,7 @@ cdef int calculate_score(sign_args, args, is_varargs=False) except *:
             else:
                 return -1
 
-        if r[0] == 'L':
+        if r[0] == 'L': # classname
 
             r = r[1:-1]
 

tests/java-src/org/jnius/SignatureTest.java

@@ -0,0 +1,22 @@
+package org.jnius;
+
+public class SignatureTest {
+
+    public static class IntOrLong {
+        boolean was_long;
+        public IntOrLong(int i) { was_long = false; }
+        public IntOrLong(long l) { was_long = true; }
+    }
+
+    public static class ShortOrLong {
+        boolean was_short;
+        public ShortOrLong(short i) { was_short = true; }
+        public ShortOrLong(long i) { was_short = false; }
+    }
+
+    public static class ShortOnly {
+        public ShortOnly(short i) { }
+        public ShortOnly(boolean o) { } // we need alternative constructor to force calculate_score
+    }
+
+}

tests/test_signature.py

@@ -172,3 +172,26 @@ def test_params(self):
         sig = signature(jvoid, [JArray(jint), JArray(jboolean)])
         self.assertEqual(sig, "([I[Z)V")
 
+    def test_calc_signature(self):
+        import sys
+        clz = autoclass("org.jnius.SignatureTest$IntOrLong")
+        obj = clz(0, debug=True) # could be int or long
+        # this isnt truly deterministic, the two possible methods are tied for score
+        self.assertTrue(obj.was_long)
+
+        obj = clz(sys.maxsize)
+        self.assertTrue(obj.was_long)
+
+        obj = clz(-1 * sys.maxsize)
+        self.assertTrue(obj.was_long)
+
+        clz = autoclass("org.jnius.SignatureTest$ShortOrLong")
+        obj = clz(0) # could be short or long
+        # this isnt truly deterministic, the two possible methods are tied for score
+        self.assertTrue(obj.was_short)
+
+        obj = clz(sys.maxsize)
+        self.assertFalse(obj.was_short)
+
+        autoclass("org.jnius.SignatureTest$ShortOnly")(0) # this should work as short
+        autoclass("org.jnius.SignatureTest$ShortOnly")(0.) # this float should be cast to short