replace fnmatch with Path.match

billbrod · billbrod · commit db50afdd9dae · 2026-03-20T16:43:03.000-04:00
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -163,9 +163,10 @@
     error will be raised.
 
 plot_exclude_patterns
-    List of wildcard (fnmatch) patterns to check against to selectively skip
-    plot directives. If any pattern matches the relative path of the file
+    List of non-recursive glob-style patterns to check against to selectively
+    skip plot directives. If any pattern matches the relative path of the file
     containing the plot directive, then that plot directive will be skipped.
+    Matches are computed using :external+python:meth:`pathlib.PurePath.match`.
 
 Notes on how it works
 ---------------------
@@ -185,7 +186,6 @@
 from collections import defaultdict
 import contextlib
 import doctest
-import fnmatch
 from io import StringIO
 import itertools
 import os
@@ -932,7 +932,7 @@ def run(arguments, content, options, state_machine, state, lineno):
 
     # make figures
     try:
-        if any([fnmatch.fnmatch(source_rel_name, pattern) for pattern in
+        if any([Path(source_rel_name).match(pattern) for pattern in
                 config.plot_exclude_patterns]):
             results = [(code, [])]
         else:
diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py
@@ -274,9 +274,9 @@ def plot_file(num, suff=''):
 @pytest.mark.parametrize('plot_exclude_patterns', [False, "*index*",
                                                    "index*", "ndex*", "?ndex*",
                                                    "*nonmatch*",
-                                                   "*range*", "*range6*",
-                                                   "*index*,*range*", "*",
-                                                   "*_range*", "*script*", ""])
+                                                   "range*", "range6*",
+                                                   "index*,range*", "*",
+                                                   "*_range*", "*script*"])
 def test_plot_exclude_patterns(tmp_path, plot_exclude_patterns):
     # test that modifying plot_exclude_patterns in config leads to skipping files
     shutil.copyfile(tinypages / 'conf.py', tmp_path / 'conf.py')
@@ -328,7 +328,7 @@ def test_plot_exclude_patterns(tmp_path, plot_exclude_patterns):
     # from the name of the script containing the plotting function), and thus doesn't
     # match. ndex* doesn't match because we're not matching substrings, and thus need
     # wildcards for missing characters
-    if plot_exclude_patterns in ["*script*", "*nonmatch*", False, "", "ndex*"]:
+    if plot_exclude_patterns in ["*script*", "*nonmatch*", False, "ndex*"]:
         assert (img_dir / "index-1.png").exists()
         assert (img_dir / "range6_range6.png").exists()
         assert (img_dir / "range6_range10.png").exists()
@@ -342,19 +342,19 @@ def test_plot_exclude_patterns(tmp_path, plot_exclude_patterns):
         assert (img_dir / "range4.png").exists()
     # name of the script used by the plot directive in the scripts rst files all match
     # this pattern and thus are all skipped
-    elif plot_exclude_patterns == "*range*":
+    elif plot_exclude_patterns == "range*":
         assert (img_dir / "index-1.png").exists()
         assert not (img_dir / "range6_range6.png").exists()
         assert not (img_dir / "range6_range10.png").exists()
         assert not (img_dir / "range4.png").exists()
     # matches the name of one script, but not the other
-    elif plot_exclude_patterns == "*range6*":
+    elif plot_exclude_patterns == "range6*":
         assert (img_dir / "index-1.png").exists()
         assert not (img_dir / "range6_range6.png").exists()
         assert not (img_dir / "range6_range10.png").exists()
         assert (img_dir / "range4.png").exists()
     # matches all relative paths, so no images created.
-    elif plot_exclude_patterns in ["*index*,*range*", "*"]:
+    elif plot_exclude_patterns in ["index*,range*", "*"]:
         assert not (img_dir / "index-1.png").exists()
         assert not (img_dir / "range6_range6.png").exists()
         assert not (img_dir / "range6_range10.png").exists()
