style: pre-commit fixes

pybind · Nov 1, 2024 · 67e5724 · 67e5724
1 parent fe27f7f
commit 67e5724
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 30 deletions.
diff --git a/include/pybind11/numpy.h b/include/pybind11/numpy.h
@@ -1437,7 +1437,7 @@ struct npy_format_descriptor<T, enable_if_t<is_same_ignoring_cvref<T, PyObject *
 };
 
 template <>
-struct npy_format_descriptor<handle, enable_if_t<sizeof(handle) == sizeof(PyObject*)>> {
+struct npy_format_descriptor<handle, enable_if_t<sizeof(handle) == sizeof(PyObject *)>> {
     static constexpr auto name = const_name("object");
 
     static constexpr int value = npy_api::NPY_OBJECT_;
@@ -1446,7 +1446,7 @@ struct npy_format_descriptor<handle, enable_if_t<sizeof(handle) == sizeof(PyObje
 };
 
 template <>
-struct npy_format_descriptor<object, enable_if_t<sizeof(object) == sizeof(PyObject*)>> {
+struct npy_format_descriptor<object, enable_if_t<sizeof(object) == sizeof(PyObject *)>> {
     static constexpr auto name = const_name("object");
 
     static constexpr int value = npy_api::NPY_OBJECT_;

diff --git a/tests/test_numpy_array.cpp b/tests/test_numpy_array.cpp
@@ -528,23 +528,21 @@ TEST_SUBMODULE(numpy_array, sm) {
                return sum_str_values;
            });
 
-    sm.def("pass_array_handle_return_sum_str_values",
-           [](const py::array_t<py::handle> &objs) {
-               std::string sum_str_values;
-               for (const auto &obj : objs) {
-                   sum_str_values += py::str(obj.attr("value"));
-               }
-               return sum_str_values;
-           });
+    sm.def("pass_array_handle_return_sum_str_values", [](const py::array_t<py::handle> &objs) {
+        std::string sum_str_values;
+        for (const auto &obj : objs) {
+            sum_str_values += py::str(obj.attr("value"));
+        }
+        return sum_str_values;
+    });
 
-    sm.def("pass_array_object_return_sum_str_values",
-           [](const py::array_t<py::object> &objs) {
-               std::string sum_str_values;
-               for (const auto &obj : objs) {
-                   sum_str_values += py::str(obj.attr("value"));
-               }
-               return sum_str_values;
-           });
+    sm.def("pass_array_object_return_sum_str_values", [](const py::array_t<py::object> &objs) {
+        std::string sum_str_values;
+        for (const auto &obj : objs) {
+            sum_str_values += py::str(obj.attr("value"));
+        }
+        return sum_str_values;
+    });
 
     sm.def("pass_array_pyobject_ptr_return_as_list",
            [](const py::array_t<PyObject *> &objs) -> py::list { return objs; });

diff --git a/tests/test_numpy_array.py b/tests/test_numpy_array.py
@@ -618,9 +618,11 @@ def test_round_trip_float():
 #       other ref-count bugs.
 class PyValueHolder:
     counter = 0
+
     def __init__(self, value):
         self.value = value
         PyValueHolder.counter += 1
+
     def __del__(self):
         PyValueHolder.counter -= 1
 
@@ -646,9 +648,7 @@ def test_pass_array_object_return_sum_str_values_ndarray(func):
     for loop in range(100):
         # Intentionally all temporaries, do not change.
         assert (
-            func(
-                np.array(WrapWithPyValueHolder(-3, "four", 5.0), dtype=object)
-            )
+            func(np.array(WrapWithPyValueHolder(-3, "four", 5.0), dtype=object))
             == "-3four5.0"
         )
     assert PyValueHolder.counter == initial_counter
@@ -666,12 +666,7 @@ def test_pass_array_object_return_sum_str_values_list(func):
     initial_counter = PyValueHolder.counter
     for loop in range(100):
         # Intentionally all temporaries, do not change.
-        assert (
-            func(
-                WrapWithPyValueHolder(2, "three", -4.0)
-            )
-            == "2three-4.0"
-        )
+        assert func(WrapWithPyValueHolder(2, "three", -4.0)) == "2three-4.0"
     assert PyValueHolder.counter == initial_counter
 
 
@@ -688,9 +683,7 @@ def test_pass_array_object_return_as_list(func):
     for loop in range(100):
         # Intentionally all temporaries, do not change.
         assert UnwrapPyValueHolder(
-            func(
-                np.array(WrapWithPyValueHolder(-1, "two", 3.0), dtype=object)
-            )
+            func(np.array(WrapWithPyValueHolder(-1, "two", 3.0), dtype=object))
         ) == [-1, "two", 3.0]
     assert PyValueHolder.counter == initial_counter