sty: pyupgrade --py39-plus

Author: effigies

tools/schemacode/src/bidsschematools/__main__.py

@@ -3,15 +3,11 @@
 import os
 import re
 import sys
+from importlib.resources import files
 from itertools import chain
 
 import click
 
-if sys.version_info < (3, 9):
-    from importlib_resources import files
-else:
-    from importlib.resources import files
-
 from .rules import regexify_filename_rules
 from .schema import export_schema, load_schema
 from .validator import _bidsignore_check

tools/schemacode/src/bidsschematools/render/text.py

@@ -60,7 +60,7 @@ def _make_entity_definition(entity, entity_info):
     """Describe an entity."""
     entity_shorthand = entity_info["name"]
     text = ""
-    text += "## {}".format(entity_shorthand)
+    text += f"## {entity_shorthand}"
     text += "\n\n"
     text += f"**Full name**: {entity_info['display_name']}"
     text += "\n\n"

tools/schemacode/src/bidsschematools/rules.py

@@ -64,7 +64,7 @@ def _optional_regex(regex, optional):
     return f"(?:{regex})?" if optional else regex
 
 
-@lru_cache()
+@lru_cache
 def _format_entity(entity, name, pattern, level, directory=False):
     if directory and entity not in DIR_ENTITIES:
         return ""
@@ -237,7 +237,7 @@ def regexify_filename_rules(
     return regex_schema
 
 
-@lru_cache()
+@lru_cache
 def regexify_all(schema_dir=None):
     """
     Create full path regexes for all BIDS specification files.

tools/schemacode/src/bidsschematools/schema.py

@@ -3,19 +3,14 @@
 import json
 import os
 import re
-import sys
 import tempfile
 from collections.abc import Iterable, Mapping
 from copy import deepcopy
 from functools import lru_cache
+from importlib.resources import files
 
 from jsonschema import ValidationError, validate
 
-if sys.version_info < (3, 9):
-    from importlib_resources import files
-else:
-    from importlib.resources import files
-
 from . import __bids_version__, __version__, utils
 from .types import Namespace
 
@@ -183,7 +178,7 @@ def flatten_enums(namespace, inplace=True):
     return namespace
 
 
-@lru_cache()
+@lru_cache
 def load_schema(schema_path=None):
     """Load the schema into a dictionary.
 

tools/schemacode/src/bidsschematools/validator.py

@@ -43,7 +43,7 @@ def _bids_schema_versioncheck(schema_dir, compatibility=VALIDATOR_SCHEMA_COMPATI
 
     schema_version_file = os.path.join(schema_dir, "SCHEMA_VERSION")
     try:
-        with open(schema_version_file, "r") as f:
+        with open(schema_version_file) as f:
             schema_version = f.readlines()[0].strip()
     except FileNotFoundError:
         lgr.warning(