Some code cleanup, black

Author: ptmcg

Diff for: pyparsing/__init__.py

@@ -121,7 +121,7 @@ def __repr__(self):
 
 
 __version_info__ = version_info(3, 2, 2, "final", 1)
-__version_time__ = "21 Mar 2025 06:20 UTC"
+__version_time__ = "22 Mar 2025 22:09 UTC"
 __version__ = __version_info__.__version__
 __versionTime__ = __version_time__
 __author__ = "Paul McGuire <[email protected]>"

Diff for: pyparsing/core.py

@@ -6157,6 +6157,7 @@ def srange(s: str) -> str:
     - any combination of the above (``'aeiouy'``,
       ``'a-zA-Z0-9_$'``, etc.)
     """
+
     def _expanded(p):
         if isinstance(p, ParseResults):
             yield from (chr(c) for c in range(ord(p[0]), ord(p[1]) + 1))
@@ -6165,11 +6166,7 @@ def _expanded(p):
 
     try:
         return "".join(
-            [
-                c
-                for part in _reBracketExpr.parse_string(s).body
-                for c in _expanded(part)
-            ]
+            [c for part in _reBracketExpr.parse_string(s).body for c in _expanded(part)]
         )
     except Exception as e:
         return ""

Diff for: pyparsing/helpers.py

@@ -205,15 +205,12 @@ def one_of(
             stacklevel=2,
         )
 
-    parse_element_class: type[ParserElement]
     if caseless:
         is_equal = lambda a, b: a.upper() == b.upper()
         masks = lambda a, b: b.upper().startswith(a.upper())
-        parse_element_class = CaselessKeyword if asKeyword else CaselessLiteral
     else:
         is_equal = operator.eq
         masks = lambda a, b: b.startswith(a)
-        parse_element_class = Keyword if asKeyword else Literal
 
     symbols: list[str]
     if isinstance(strs, str_type):
@@ -256,7 +253,8 @@ def one_of(
             if asKeyword:
                 patt = rf"\b(?:{patt})\b"
 
-            ret = Regex(patt, flags=re_flags).set_name(" | ".join(re.escape(s) for s in symbols))
+            ret = Regex(patt, flags=re_flags)
+            ret.set_name(" | ".join(re.escape(s) for s in symbols))
 
             if caseless:
                 # add parse action to return symbols as specified, not in random
@@ -271,7 +269,15 @@ def one_of(
                 "Exception creating Regex for one_of, building MatchFirst", stacklevel=2
             )
 
-    # last resort, just use MatchFirst
+    # last resort, just use MatchFirst of Token class corresponding to caseless
+    # and asKeyword settings
+    CASELESS = KEYWORD = True
+    parse_element_class = {
+        (CASELESS, KEYWORD): CaselessKeyword,
+        (CASELESS, not KEYWORD): CaselessLiteral,
+        (not CASELESS, KEYWORD): Keyword,
+        (not CASELESS, not KEYWORD): Literal,
+    }[(caseless, asKeyword)]
     return MatchFirst(parse_element_class(sym) for sym in symbols).set_name(
         " | ".join(symbols)
     )