Rename functions.

erykoff · TallJimbo · commit bfdc408fb464 · 2023-04-10T16:34:25.000-04:00
diff --git a/tests/pybind11_test.py b/tests/pybind11_test.py
@@ -41,15 +41,16 @@ def testStrideHandling(self):
         # the zero shape array tests are simply checking that pybind11 can handle
         # arbitrary strides (non-zero for length 1 array, zero for length 0 array
         # for numpy >= 1.23).
-        pybind11_test_mod.acceptZeroShapeArray10(array)
-        pybind11_test_mod.acceptZeroShapeArray11(array)
+        pybind11_test_mod.acceptAnyArray10(array)
+        pybind11_test_mod.acceptAnyArray11(array)
         array = numpy.zeros(0, dtype=float)
-        pybind11_test_mod.acceptZeroShapeArray10(array)
-        pybind11_test_mod.acceptZeroShapeArray11(array)
+        pybind11_test_mod.acceptAnyArray10(array)
+        pybind11_test_mod.acceptAnyArray11(array)
         # test that we gracefully fail when the strides are no multiples of the itemsize
         dtype = numpy.dtype([("f1", numpy.float64), ("f2", numpy.int16)])
         table = numpy.zeros(3, dtype=dtype)
-        self.assertRaises(TypeError, pybind11_test_mod.acceptArray10, table['f1'])
+        self.assertRaises(TypeError, pybind11_test_mod.acceptAnyArray10, table['f1'])
+        self.assertRaises(TypeError, pybind11_test_mod.acceptAnyArray11, table['f1'])
 
     def testNone(self):
         array = numpy.zeros(10, dtype=float)
@@ -62,7 +63,8 @@ def testNonNativeByteOrder(self):
         d2 = numpy.dtype(">f8")
         nonnative = d2 if d1 == numpy.dtype(float) else d1
         a = numpy.zeros(5, dtype=nonnative)
-        self.assertRaises(TypeError, pybind11_test_mod.acceptArray10, a)
+        self.assertRaises(TypeError, pybind11_test_mod.acceptAnyArray10, a)
+        self.assertRaises(TypeError, pybind11_test_mod.acceptAnyArray11, a)
 
 
 if __name__ == "__main__":
diff --git a/tests/pybind11_test_mod.cc b/tests/pybind11_test_mod.cc
@@ -39,9 +39,9 @@ bool acceptArray1(ndarray::Array<double,1,1> const & a1) {
 #endif
 }
 
-void acceptZeroShapeArray10(ndarray::Array<double,1,0> const & a1) {}
+void acceptAnyArray10(ndarray::Array<double,1,0> const & a1) {}
 
-void acceptZeroShapeArray11(ndarray::Array<double,1,1> const & a1) {}
+void acceptAnyArray11(ndarray::Array<double,1,1> const & a1) {}
 
 bool acceptArray3(ndarray::Array<double,3> const & a1) {
     ndarray::Array<double,3> a2 = returnArray3();
@@ -71,8 +71,8 @@ PYBIND11_MODULE(pybind11_test_mod, mod) {
     mod.def("returnArray3", returnArray3);
     mod.def("returnConstArray3", returnConstArray3);
     mod.def("acceptArray1", acceptArray1);
-    mod.def("acceptZeroShapeArray10", acceptZeroShapeArray10);
-    mod.def("acceptZeroShapeArray11", acceptZeroShapeArray11);
+    mod.def("acceptAnyArray10", acceptAnyArray10);
+    mod.def("acceptAnyArray11", acceptAnyArray11);
     mod.def("acceptArray3", acceptArray3);
     mod.def("acceptNoneArray", acceptNoneArray, "array"_a = nullptr);
 }
