relax regex for warning on sanitize reorder error

nilearn · Jun 19, 2023 · 13fa10a · 13fa10a
1 parent b2562d6
commit 13fa10a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/nilearn/plotting/matrix_plotting.py b/nilearn/plotting/matrix_plotting.py
@@ -99,7 +99,7 @@ def _sanitize_tri(tri):
 
 def _sanitize_reorder(reorder):
     """Help for plot_matrix."""
-    VALID_REORDER_ARGS = {True, False, 'single', 'complete', 'average'}
+    VALID_REORDER_ARGS = (True, False, 'single', 'complete', 'average')
     if reorder not in VALID_REORDER_ARGS:
         param_to_print = []
         for item in VALID_REORDER_ARGS:

diff --git a/nilearn/plotting/tests/test_matrix_plotting.py b/nilearn/plotting/tests/test_matrix_plotting.py
@@ -74,7 +74,7 @@ def test_sanitize_tri_error(tri):
         _sanitize_tri(tri)
 
 
-VALID_REORDER_VALUES = {True, False, 'single', 'complete', 'average'}
+VALID_REORDER_VALUES = (True, False, 'single', 'complete', 'average')
 
 
 @pytest.mark.parametrize("reorder", VALID_REORDER_VALUES)
@@ -89,15 +89,8 @@ def test_sanitize_reorder(reorder):
 @pytest.mark.parametrize("reorder", [None, "foo", 2])
 def test_sanitize_reorder_error(reorder):
     from ..matrix_plotting import _sanitize_reorder
-    param_to_print = []
-    for item in VALID_REORDER_VALUES:
-        if isinstance(item, str):
-            param_to_print.append(f'"{item}"')
-        else:
-            param_to_print.append(str(item))
     with pytest.raises(ValueError,
-                       match=("Parameter reorder needs to be one of:\\n"
-                              f"{', '.join(param_to_print)}.")):
+                       match=("Parameter reorder needs to be one of")):
         _sanitize_reorder(reorder)