Let Ruff automatically drop Python 3.9 code, enable more lints

Author: oprypin

properdocs/commands/build.py

@@ -4,7 +4,8 @@
 import logging
 import os
 import time
-from typing import TYPE_CHECKING, Sequence
+from collections.abc import Sequence
+from typing import TYPE_CHECKING
 from urllib.parse import urljoin, urlsplit
 
 import jinja2

properdocs/config/base.py

@@ -6,20 +6,9 @@
 import sys
 import warnings
 from collections import UserDict
+from collections.abc import Iterator, Mapping, Sequence
 from contextlib import contextmanager
-from typing import (
-    IO,
-    TYPE_CHECKING,
-    Any,
-    Generic,
-    Iterator,
-    List,
-    Mapping,
-    Sequence,
-    Tuple,
-    TypeVar,
-    overload,
-)
+from typing import IO, TYPE_CHECKING, Any, Generic, TypeVar, overload
 
 from properdocs import exceptions, utils
 from properdocs.utils import weak_property
@@ -111,11 +100,11 @@ def __eq__(self, other):
         return type(self) is type(other) and str(self) == str(other)
 
 
-PlainConfigSchemaItem = Tuple[str, BaseConfigOption]
+PlainConfigSchemaItem = tuple[str, BaseConfigOption]
 PlainConfigSchema = Sequence[PlainConfigSchemaItem]
 
-ConfigErrors = List[Tuple[str, Exception]]
-ConfigWarnings = List[Tuple[str, str]]
+ConfigErrors = list[tuple[str, Exception]]
+ConfigWarnings = list[tuple[str, str]]
 
 
 class Config(UserDict):
@@ -268,7 +257,7 @@ def user_configs(self) -> Sequence[Mapping[str, Any]]:
         return self.__user_configs
 
 
-@functools.lru_cache(maxsize=None)
+@functools.cache
 def get_schema(cls: type) -> PlainConfigSchema:
     """Extract ConfigOptions defined in a class (used just as a container) and put them into a schema tuple."""
     if issubclass(cls, Config):

properdocs/config/config_options.py

@@ -10,22 +10,9 @@
 import types
 import warnings
 from collections import Counter, UserString
+from collections.abc import Callable, Collection, Iterator, Mapping, MutableMapping
 from types import SimpleNamespace
-from typing import (
-    Any,
-    Callable,
-    Collection,
-    Dict,
-    Generic,
-    Iterator,
-    List,
-    Mapping,
-    MutableMapping,
-    NamedTuple,
-    TypeVar,
-    Union,
-    overload,
-)
+from typing import Any, Generic, NamedTuple, TypeVar, Union, overload
 from urllib.parse import quote as urlquote
 from urllib.parse import urlsplit, urlunsplit
 
@@ -184,7 +171,7 @@ def validate(self, value):
         return self.run_validation(value)
 
 
-class ListOfItems(Generic[T], BaseConfigOption[List[T]]):
+class ListOfItems(Generic[T], BaseConfigOption[list[T]]):
     """
     Validates a homogeneous list of items.
 
@@ -239,7 +226,7 @@ def run_validation(self, value: object) -> list[T]:
         return [fake_config[k] for k in fake_keys]
 
 
-class DictOfItems(Generic[T], BaseConfigOption[Dict[str, T]]):
+class DictOfItems(Generic[T], BaseConfigOption[dict[str, T]]):
     """
     Validates a dict of items. Keys are always strings.
 
@@ -942,7 +929,7 @@ def run_validation(self, value: object) -> ExtraScriptValue | str:
         return self.option_type.run_validation(value)
 
 
-class MarkdownExtensions(OptionallyRequired[List[str]]):
+class MarkdownExtensions(OptionallyRequired[list[str]]):
     """
     Markdown Extensions Config Option.
 
@@ -1078,8 +1065,7 @@ def _parse_configs(cls, value: list | tuple | dict) -> Iterator[tuple[str, dict]
     def load_plugin_with_namespace(self, name: str, config) -> tuple[str, plugins.BasePlugin]:
         if '/' in name:  # It's already specified with a namespace.
             # Special case: allow to explicitly skip namespaced loading:
-            if name.startswith('/'):
-                name = name[1:]
+            name = name.removeprefix('/')
         else:
             # Attempt to load with prepended namespace for the current theme.
             if self.theme_key and self._config:
@@ -1155,7 +1141,7 @@ def load_plugin(self, name: str, config) -> plugins.BasePlugin:
         return plugin
 
 
-class Hooks(BaseConfigOption[List[types.ModuleType]]):
+class Hooks(BaseConfigOption[list[types.ModuleType]]):
     """A list of Python scripts to be treated as instances of plugins."""
 
     def __init__(self, plugins_key: str) -> None:
@@ -1177,7 +1163,7 @@ def run_validation(self, value: object) -> Mapping[str, Any]:
             hooks[name] = self._load_hook(name, path)
         return hooks
 
-    @functools.lru_cache(maxsize=None)
+    @functools.cache
     def _load_hook(self, name, path):
         import importlib.util
 

properdocs/config/defaults.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import logging
-from typing import IO, Dict, Mapping
+from collections.abc import Mapping
+from typing import IO
 
 from properdocs.config import base
 from properdocs.config import config_options as c
@@ -134,7 +135,7 @@ class ProperDocsConfig(base.Config):
     )
     """PyMarkdown extension names."""
 
-    mdx_configs = c.Private[Dict[str, dict]]()
+    mdx_configs = c.Private[dict[str, dict]]()
     """PyMarkdown extension configs. Populated from `markdown_extensions`."""
 
     strict = c.Type(bool, default=False)

properdocs/contrib/search/__init__.py

@@ -2,7 +2,7 @@
 
 import logging
 import os
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING
 
 from properdocs import utils
 from properdocs.config import base
@@ -20,7 +20,7 @@
 base_path = os.path.dirname(os.path.abspath(__file__))
 
 
-class LangOption(c.OptionallyRequired[List[str]]):
+class LangOption(c.OptionallyRequired[list[str]]):
     """Validate Language(s) provided in config are known languages."""
 
     def get_lunr_supported_lang(self, lang):

properdocs/livereload/__init__.py

@@ -21,7 +21,8 @@
 import webbrowser
 import wsgiref.simple_server
 import wsgiref.util
-from typing import Any, BinaryIO, Callable, Iterable
+from collections.abc import Callable, Iterable
+from typing import Any, BinaryIO
 
 import watchdog.events
 import watchdog.observers.polling

properdocs/localization.py

@@ -2,7 +2,8 @@
 
 import logging
 import os
-from typing import TYPE_CHECKING, Sequence
+from collections.abc import Sequence
+from typing import TYPE_CHECKING
 
 from jinja2.ext import Extension, InternationalizationExtension
 

properdocs/plugins.py

@@ -3,13 +3,9 @@
 from __future__ import annotations
 
 import logging
-import sys
-from typing import TYPE_CHECKING, Any, Callable, Generic, Literal, MutableMapping, TypeVar, overload
-
-if sys.version_info >= (3, 10):
-    from importlib.metadata import EntryPoint, entry_points
-else:
-    from importlib_metadata import EntryPoint, entry_points
+from collections.abc import Callable, MutableMapping
+from importlib.metadata import EntryPoint, entry_points
+from typing import TYPE_CHECKING, Any, Generic, Literal, TypeVar, overload
 
 if TYPE_CHECKING:
     import jinja2.environment
@@ -32,7 +28,9 @@
     from properdocs.utils.templates import TemplateContext
 
 if TYPE_CHECKING:
-    from typing_extensions import Concatenate, ParamSpec
+    from typing import Concatenate
+
+    from typing_extensions import ParamSpec
 else:
     ParamSpec = TypeVar
 

properdocs/structure/__init__.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 import abc
-from typing import TYPE_CHECKING, Iterable
+from collections.abc import Iterable
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from properdocs.structure.nav import Section

properdocs/structure/files.py

@@ -7,9 +7,10 @@
 import posixpath
 import shutil
 import warnings
+from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence
 from functools import cached_property
 from pathlib import PurePath, PurePosixPath
-from typing import TYPE_CHECKING, Callable, Iterable, Iterator, Mapping, Sequence, overload
+from typing import TYPE_CHECKING, overload
 from urllib.parse import quote as urlquote
 
 import pathspec