Bring back .attr("value") in return_array_cpp_loop()

This was meant to further stress-test correctness of refcount handling.

All modified test functions were manually leak-checked (`while True`, top command, Python 3.12.3, Ubuntu 24.01, gcc 13.2.0).

Author: rwgk

tests/test_numpy_array.cpp

@@ -195,7 +195,7 @@ py::array_t<PyObjectType> return_array_cpp_loop(const py::list &objs) {
     PyObjectType *data = arr_from_list.mutable_data();
     for (py::size_t i = 0; i < arr_size; i++) {
         assert(!data[i]);
-        data[i] = convert_to_pyobjecttype<PyObjectType>(objs[i]);
+        data[i] = convert_to_pyobjecttype<PyObjectType>(objs[i].attr("value"));
     }
     return arr_from_list;
 }

tests/test_numpy_array.py

@@ -629,64 +629,61 @@ def UnwrapPyValueHolder(vhs):
     return [vh.value for vh in vhs]
 
 
+PASS_ARRAY_PYOBJECT_RETURN_SUM_STR_VALUES_FUNCTIONS = [
+    m.pass_array_pyobject_ptr_return_sum_str_values,
+    m.pass_array_handle_return_sum_str_values,
+    m.pass_array_object_return_sum_str_values,
+]
+
+
 @pytest.mark.parametrize(
-    "func",
-    [
-        m.pass_array_pyobject_ptr_return_sum_str_values,
-        m.pass_array_handle_return_sum_str_values,
-        m.pass_array_object_return_sum_str_values,
-    ],
+    "pass_array", PASS_ARRAY_PYOBJECT_RETURN_SUM_STR_VALUES_FUNCTIONS
 )
-def test_pass_array_object_return_sum_str_values_ndarray(func):
+def test_pass_array_object_return_sum_str_values_ndarray(pass_array):
     # Intentionally all temporaries, do not change.
     assert (
-        func(np.array(WrapWithPyValueHolder(-3, "four", 5.0), dtype=object))
+        pass_array(np.array(WrapWithPyValueHolder(-3, "four", 5.0), dtype=object))
         == "-3four5.0"
     )
 
 
 @pytest.mark.parametrize(
-    "func",
-    [
-        m.pass_array_pyobject_ptr_return_sum_str_values,
-        m.pass_array_handle_return_sum_str_values,
-        m.pass_array_object_return_sum_str_values,
-    ],
+    "pass_array", PASS_ARRAY_PYOBJECT_RETURN_SUM_STR_VALUES_FUNCTIONS
 )
-def test_pass_array_object_return_sum_str_values_list(func):
+def test_pass_array_object_return_sum_str_values_list(pass_array):
     # Intentionally all temporaries, do not change.
-    assert func(WrapWithPyValueHolder(2, "three", -4.0)) == "2three-4.0"
+    assert pass_array(WrapWithPyValueHolder(2, "three", -4.0)) == "2three-4.0"
 
 
 @pytest.mark.parametrize(
-    "func",
+    "pass_array",
     [
         m.pass_array_pyobject_ptr_return_as_list,
         m.pass_array_handle_return_as_list,
         m.pass_array_object_return_as_list,
     ],
 )
-def test_pass_array_object_return_as_list(func):
+def test_pass_array_object_return_as_list(pass_array):
     # Intentionally all temporaries, do not change.
     assert UnwrapPyValueHolder(
-        func(np.array(WrapWithPyValueHolder(-1, "two", 3.0), dtype=object))
+        pass_array(np.array(WrapWithPyValueHolder(-1, "two", 3.0), dtype=object))
     ) == [-1, "two", 3.0]
 
 
 @pytest.mark.parametrize(
-    "func",
+    ("return_array", "unwrap"),
     [
-        m.return_array_pyobject_ptr_cpp_loop,
-        m.return_array_handle_cpp_loop,
-        m.return_array_object_cpp_loop,
-        m.return_array_pyobject_ptr_from_list,
-        m.return_array_handle_from_list,
-        m.return_array_object_from_list,
+        (m.return_array_pyobject_ptr_cpp_loop, list),
+        (m.return_array_handle_cpp_loop, list),
+        (m.return_array_object_cpp_loop, list),
+        (m.return_array_pyobject_ptr_from_list, UnwrapPyValueHolder),
+        (m.return_array_handle_from_list, UnwrapPyValueHolder),
+        (m.return_array_object_from_list, UnwrapPyValueHolder),
     ],
 )
-def test_return_array_object_cpp_loop(func):
+def test_return_array_object_cpp_loop(return_array, unwrap):
     # Intentionally all temporaries, do not change.
-    arr_from_list = func(WrapWithPyValueHolder(6, "seven", -8.0))
+    arr_from_list = return_array(WrapWithPyValueHolder(6, "seven", -8.0))
     assert isinstance(arr_from_list, np.ndarray)
     assert arr_from_list.dtype == np.dtype("O")
-    assert UnwrapPyValueHolder(arr_from_list) == [6, "seven", -8.0]
+    assert unwrap(arr_from_list) == [6, "seven", -8.0]