Merge pull request #25010 from meeseeksmachine/auto-backport-of-pr-24989-on-v3.7.x

QuLogic · web-flow · commit 7fb281ee2809 · 2023-01-16T22:44:29.000-05:00
Backport PR #24989 on branch v3.7.x (Suppress pyparsing warning)
diff --git a/lib/matplotlib/_fontconfig_pattern.py b/lib/matplotlib/_fontconfig_pattern.py
@@ -13,7 +13,7 @@
 import re
 
 from pyparsing import (
-    Optional, ParseException, Regex, StringEnd, Suppress, ZeroOrMore)
+    Group, Optional, ParseException, Regex, StringEnd, Suppress, ZeroOrMore)
 
 from matplotlib import _api
 
@@ -64,7 +64,7 @@ def comma_separated(elem):
     name = Regex(r"[a-z]+")
     value = Regex(r"([^%s]|(\\[%s]))*" % (_value_punc, _value_punc))
     # replace trailing `| name` by oneOf(_CONSTANTS) in mpl 3.9.
-    prop = (name + Suppress("=") + comma_separated(value)) | name
+    prop = Group((name + Suppress("=") + comma_separated(value)) | name)
     return (
         Optional(comma_separated(family)("families"))
         + Optional("-" + comma_separated(size)("sizes"))
