Enable SIM style rules which catch minor import micro-optimizations.

Julian · Julian · commit b307f310f86b · 2023-11-24T14:46:24.000-05:00
May as well.

Also Sphinx is again randomly confused now by an import, which is fine,
so now ValidationError is only on the exceptions page.
diff --git a/docs/api/index.rst b/docs/api/index.rst
@@ -17,7 +17,7 @@ Submodules
 .. automodule:: jsonschema
    :members:
    :imported-members:
-   :exclude-members: FormatError, Validator
+   :exclude-members: FormatError, Validator, ValidationError
 
 .. autodata:: jsonschema._format._F
 
diff --git a/jsonschema/exceptions.py b/jsonschema/exceptions.py
@@ -4,10 +4,9 @@
 from __future__ import annotations
 
 from collections import defaultdict, deque
-from collections.abc import Iterable, Mapping, MutableMapping
 from pprint import pformat
 from textwrap import dedent, indent
-from typing import ClassVar
+from typing import TYPE_CHECKING, ClassVar
 import heapq
 import itertools
 import warnings
@@ -17,6 +16,9 @@
 
 from jsonschema import _utils
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable, Mapping, MutableMapping
+
 WEAK_MATCHES: frozenset[str] = frozenset(["anyOf", "oneOf"])
 STRONG_MATCHES: frozenset[str] = frozenset()
 
diff --git a/jsonschema/protocols.py b/jsonschema/protocols.py
@@ -7,7 +7,6 @@
 
 from __future__ import annotations
 
-from collections.abc import Mapping
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -22,12 +21,14 @@
 # therefore, only import at type-checking time (to avoid circular references),
 # but use `jsonschema` for any types which will otherwise not be resolvable
 if TYPE_CHECKING:
+    from collections.abc import Mapping
+
+    import referencing.jsonschema
+
     from jsonschema import _typing
+    from jsonschema.exceptions import ValidationError
     import jsonschema
     import jsonschema.validators
-    import referencing.jsonschema
-
-from jsonschema.exceptions import ValidationError
 
 # For code authors working on the validator protocol, these are the three
 # use-cases which should be kept in mind:
diff --git a/jsonschema/tests/_suite.py b/jsonschema/tests/_suite.py
@@ -3,7 +3,6 @@
 """
 from __future__ import annotations
 
-from collections.abc import Iterable, Mapping
 from contextlib import suppress
 from functools import partial
 from pathlib import Path
@@ -20,6 +19,8 @@
 import referencing.jsonschema
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable, Mapping
+
     import pyperf
 
 from jsonschema.validators import _VALIDATORS
diff --git a/jsonschema/validators.py b/jsonschema/validators.py
@@ -7,6 +7,7 @@
 from collections.abc import Iterable, Mapping, Sequence
 from functools import lru_cache
 from operator import methodcaller
+from typing import TYPE_CHECKING
 from urllib.parse import unquote, urldefrag, urljoin, urlsplit
 from urllib.request import urlopen
 from warnings import warn
@@ -30,7 +31,9 @@
     _utils,
     exceptions,
 )
-from jsonschema.protocols import Validator
+
+if TYPE_CHECKING:
+    from jsonschema.protocols import Validator
 
 _UNSET = _utils.Unset()
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -141,7 +141,7 @@ exclude = ["jsonschema/benchmarks/*"]
 
 [tool.ruff]
 line-length = 79
-select = ["B", "D", "D204", "E", "F", "Q", "RUF", "SIM", "UP", "W"]
+select = ["B", "D", "D204", "E", "F", "Q", "RUF", "SIM", "TCH", "UP", "W"]
 ignore = [
   # Wat, type annotations for self and cls, why is this a thing?
   "ANN101",
@@ -152,6 +152,8 @@ ignore = [
   "B008",
   # raise SomeException(...) is fine.
   "B904",
+  # There's no need for explicit strict, this is simply zip's default behavior.
+  "B905",
   # It's fine to not have docstrings for magic methods.
   "D105",
   # __init__ especially doesn't need a docstring
@@ -170,6 +172,8 @@ ignore = [
   "D407",
   # Plz spaces after section headers
   "D412",
+  # Not sure what heuristic this uses, but it seems easy for it to be wrong.
+  "SIM300",
   # We support 3.8 + 3.9
   "UP007",
 ]
