Fix pandas API usages

Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: ctrueden

src/scyjava/_convert.py

@@ -237,72 +237,90 @@ def _stock_java_converters() -> List[Converter]:
         ),
         Converter(
             name="int -> java.lang.Byte",
-            predicate=lambda obj, **hints: isinstance(obj, int)
-            and ("type" in hints and hints["type"] in ("b", "byte", "Byte"))
-            and _jc.Byte.MIN_VALUE <= obj <= _jc.Byte.MAX_VALUE,
+            predicate=lambda obj, **hints: (
+                isinstance(obj, int)
+                and ("type" in hints and hints["type"] in ("b", "byte", "Byte"))
+                and _jc.Byte.MIN_VALUE <= obj <= _jc.Byte.MAX_VALUE
+            ),
             converter=_jc.Byte,
             priority=Priority.HIGH,
         ),
         Converter(
             name="int -> java.lang.Short",
-            predicate=lambda obj, **hints: isinstance(obj, int)
-            and ("type" in hints and hints["type"] in ("s", "short", "Short"))
-            and _jc.Short.MIN_VALUE <= obj <= _jc.Short.MAX_VALUE,
+            predicate=lambda obj, **hints: (
+                isinstance(obj, int)
+                and ("type" in hints and hints["type"] in ("s", "short", "Short"))
+                and _jc.Short.MIN_VALUE <= obj <= _jc.Short.MAX_VALUE
+            ),
             converter=_jc.Short,
             priority=Priority.HIGH,
         ),
         Converter(
             name="int -> java.lang.Integer",
-            predicate=lambda obj, **hints: isinstance(obj, int)
-            and ("type" not in hints or hints["type"] in ("i", "int", "Integer"))
-            and _jc.Integer.MIN_VALUE <= obj <= _jc.Integer.MAX_VALUE,
+            predicate=lambda obj, **hints: (
+                isinstance(obj, int)
+                and ("type" not in hints or hints["type"] in ("i", "int", "Integer"))
+                and _jc.Integer.MIN_VALUE <= obj <= _jc.Integer.MAX_VALUE
+            ),
             converter=_jc.Integer,
         ),
         Converter(
             name="int -> java.lang.Long",
-            predicate=lambda obj, **hints: isinstance(obj, int)
-            and ("type" not in hints or hints["type"] in ("j", "l", "long", "Long"))
-            and _jc.Long.MIN_VALUE <= obj <= _jc.Long.MAX_VALUE,
+            predicate=lambda obj, **hints: (
+                isinstance(obj, int)
+                and ("type" not in hints or hints["type"] in ("j", "l", "long", "Long"))
+                and _jc.Long.MIN_VALUE <= obj <= _jc.Long.MAX_VALUE
+            ),
             converter=_jc.Long,
             priority=Priority.NORMAL - 1,
         ),
         Converter(
             name="int -> java.math.BigInteger",
-            predicate=lambda obj, **hints: isinstance(obj, int)
-            and (
-                "type" not in hints or hints["type"] in ("bi", "bigint", "BigInteger")
+            predicate=lambda obj, **hints: (
+                isinstance(obj, int)
+                and (
+                    "type" not in hints
+                    or hints["type"] in ("bi", "bigint", "BigInteger")
+                )
             ),
             converter=lambda obj: _jc.BigInteger(str(obj)),
             priority=Priority.NORMAL - 2,
         ),
         Converter(
             name="float -> java.lang.Float",
-            predicate=lambda obj, **hints: isinstance(obj, float)
-            and ("type" not in hints or hints["type"] in ("f", "float", "Float"))
-            and (
-                math.isinf(obj)
-                or math.isnan(obj)
-                or -_jc.Float.MAX_VALUE <= obj <= _jc.Float.MAX_VALUE
+            predicate=lambda obj, **hints: (
+                isinstance(obj, float)
+                and ("type" not in hints or hints["type"] in ("f", "float", "Float"))
+                and (
+                    math.isinf(obj)
+                    or math.isnan(obj)
+                    or -_jc.Float.MAX_VALUE <= obj <= _jc.Float.MAX_VALUE
+                )
             ),
             converter=_jc.Float,
         ),
         Converter(
             name="float -> java.lang.Double",
-            predicate=lambda obj, **hints: isinstance(obj, float)
-            and ("type" not in hints or hints["type"] in ("d", "double", "Double"))
-            and (
-                math.isinf(obj)
-                or math.isnan(obj)
-                or -_jc.Double.MAX_VALUE <= obj <= _jc.Double.MAX_VALUE
+            predicate=lambda obj, **hints: (
+                isinstance(obj, float)
+                and ("type" not in hints or hints["type"] in ("d", "double", "Double"))
+                and (
+                    math.isinf(obj)
+                    or math.isnan(obj)
+                    or -_jc.Double.MAX_VALUE <= obj <= _jc.Double.MAX_VALUE
+                )
             ),
             converter=_jc.Double,
             priority=Priority.NORMAL - 1,
         ),
         Converter(
             name="float -> java.math.BigDecimal",
-            predicate=lambda obj, **hints: isinstance(obj, float)
-            and (
-                "type" not in hints or hints["type"] in ("bd", "bigdec", "BigDecimal")
+            predicate=lambda obj, **hints: (
+                isinstance(obj, float)
+                and (
+                    "type" not in hints
+                    or hints["type"] in ("bd", "bigdec", "BigDecimal")
+                )
             ),
             converter=lambda obj: _jc.BigDecimal(str(obj)),
             priority=Priority.NORMAL - 2,

tests/test_introspect.py

@@ -53,7 +53,9 @@ def test_jreflect_ctors(self):
         arraylist_Obj = scyjava.jreflect(ArrayList, "constructors")
         assert len(str_Obj) == len(arraylist_Obj) == 3
         arraylist_Obj.sort(
-            key=lambda row: f"{row['type']}:{row['name']}:{','.join(str(row['arguments']))}"
+            key=lambda row: (
+                f"{row['type']}:{row['name']}:{','.join(str(row['arguments']))}"
+            )
         )
         assert arraylist_Obj == [
             {

tests/test_pandas.py

@@ -60,11 +60,11 @@ def testPandasToTable(self):
         df = pd.DataFrame(array, columns=columns)
 
         # Convert column 0 to integer
-        df.iloc[:, 0] = (df.iloc[:, 0] * 100).astype("int")
+        df[columns[0]] = (df[columns[0]] * 100).astype("int")
         # Convert column 1 to bool
-        df.iloc[:, 1] = df.iloc[:, 1] > 0.5
+        df[columns[1]] = df[columns[1]] > 0.5
         # Convert column 2 to string
-        df.iloc[:, 2] = df.iloc[:, 2].to_string(index=False).split("\n")
+        df[columns[2]] = df[columns[2]].to_string(index=False).split("\n")
 
         table = to_java(df)
 
@@ -137,11 +137,11 @@ def testTabletoPandas(self):
 
         # fill mixed table
         for i in range(table.getRowCount()):
-            table.set(0, i, Float(float(array_float[i])))
+            table.set(0, i, Float(float(array_float[i].item())))
             table.set(1, i, Integer(int(array_int[i].item())))
-            table.set(2, i, Boolean(bool(array_bool[i])))
+            table.set(2, i, Boolean(bool(array_bool[i].item())))
             table.set(3, i, String(array_str[i]))
-            table.set(4, i, Double(float(array_double[i])))
+            table.set(4, i, Double(float(array_double[i].item())))
 
         df = to_python(table)
         # Table types cannot be the same here, unless we want to cast.