scikit-learn
diff --git a/‎sklearn/utils/tests/test_validation.py
Copy file name to clipboardExpand all lines: sklearn/utils/tests/test_validation.py
+21Lines changed: 21 additions & 0 deletions b/‎sklearn/utils/tests/test_validation.py
Copy file name to clipboardExpand all lines: sklearn/utils/tests/test_validation.py
+21Lines changed: 21 additions & 0 deletions
diff --git a/‎sklearn/utils/validation.py
Copy file name to clipboardExpand all lines: sklearn/utils/validation.py
+2-2Lines changed: 2 additions & 2 deletions b/‎sklearn/utils/validation.py
Copy file name to clipboardExpand all lines: sklearn/utils/validation.py
+2-2Lines changed: 2 additions & 2 deletions
@@ -2358,3 +2358,24 @@ def test_force_all_finite_rename_warning():
 
     with pytest.warns(FutureWarning, match=msg):
         as_float_array(X, force_all_finite=True)
+
+
+@pytest.mark.parametrize(
+    ["X", "estimator", "expected_error_message"],
+    [
+        (
+            np.array([[[1, 2], [3, 4]], [[1, 2], [3, 4]]]),
+            RandomForestRegressor(),
+            "Found array with dim 3, while dim <= 2 is required by "
+            "RandomForestRegressor.",
+        ),
+        (
+            np.array([[[1, 2], [3, 4]], [[1, 2], [3, 4]]]),
+            None,
+            "Found array with dim 3, while dim <= 2 is required.",
+        ),
+    ],
+)
+def test_check_array_allow_nd_errors(X, estimator, expected_error_message):
+    with pytest.raises(ValueError, match=expected_error_message):
+        check_array(X, estimator=estimator)
@@ -1097,8 +1097,8 @@ def is_sparse(dtype):
             )
         if not allow_nd and array.ndim >= 3:
             raise ValueError(
-                "Found array with dim %d. %s expected <= 2."
-                % (array.ndim, estimator_name)
+                f"Found array with dim {array.ndim},"
+                f" while dim <= 2 is required{context}."
             )
 
         if ensure_all_finite:
Original file line number	Diff line number	Diff line change
`@@ -1097,8 +1097,8 @@ def is_sparse(dtype):`
`1097`	`1097`	`)`
`1098`	`1098`	`if not allow_nd and array.ndim >= 3:`
`1099`	`1099`	`raise ValueError(`
`1100`		`- "Found array with dim %d. %s expected <= 2."`
`1101`		`- % (array.ndim, estimator_name)`
	`1100`	`+ f"Found array with dim {array.ndim},"`
	`1101`	`+ f" while dim <= 2 is required{context}."`
`1102`	`1102`	`)`
`1103`	`1103`
`1104`	`1104`	`if ensure_all_finite:`