Clean lint errors.

Author: adamghill

example/manage.py

@@ -1,14 +1,16 @@
 #!/usr/bin/env python
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
 
 
 def main():
     """Run administrative tasks."""
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project.settings")
+
     try:
-        from django.core.management import execute_from_command_line
+        from django.core.management import execute_from_command_line  # noqa: PLC0415
     except ImportError as exc:
         raise ImportError(
             "Couldn't import Django. Are you sure it's installed and "

pyproject.toml

@@ -63,7 +63,7 @@ dev-dependencies = [
 [tool.ruff]
 src = ["src"]
 exclude = []
-target-version = "py39"
+target-version = "py310"
 line-length = 120
 lint.select = [
   "A",
@@ -144,7 +144,7 @@ skip_empty = true
 sort = "cover"
 
 [tool.mypy]
-python_version = "3.9"
+python_version = "3.10"
 warn_return_any = true
 warn_unused_configs = true
 ignore_missing_imports = true

src/dj_angles/attributes.py

@@ -1,5 +1,5 @@
 from collections.abc import Sequence
-from typing import Optional, SupportsIndex
+from typing import SupportsIndex
 
 from dj_angles.exceptions import DuplicateAttributeError, MissingAttributeError
 from dj_angles.tokenizer import yield_tokens
@@ -21,7 +21,7 @@ class Attribute:
     key: str
     """Key of the attribute. Always defined."""
 
-    value: Optional[str] = None
+    value: str | None = None
     """Optional value of the attribute. Defaults to `None`."""
 
     has_value: bool = False
@@ -88,7 +88,7 @@ def has(self, name: str) -> bool:
 
         return self.get(name) is not None
 
-    def get(self, name: str) -> Optional[Attribute]:
+    def get(self, name: str) -> Attribute | None:
         """Get an :obj:`~dj_angles.attributes.Attribute` by name. Returns `None` if the attribute is missing.
 
         Args:
@@ -123,7 +123,7 @@ def remove(self, key: str) -> None:
 
         self._attributes = _attributes
 
-    def pluck_value(self, name: str) -> Optional[str]:
+    def pluck_value(self, name: str) -> str | None:
         """Get the value of an :obj:`~dj_angles.attributes.Attribute` by name and remove the attribute from the tag
         attributes.
 

src/dj_angles/exceptions.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from dj_angles.tags import Tag
@@ -50,7 +50,7 @@ class InvalidAttributeError(Exception):
     name: str
     """The name of the attribute."""
 
-    def __init__(self, name: str, message: Optional[str] = None):
+    def __init__(self, name: str, message: str | None = None):
         super().__init__(message)
 
         self.name = name

src/dj_angles/htmls.py

@@ -1,5 +1,4 @@
 import re
-from typing import Optional
 
 from dj_angles.tags import Tag
 
@@ -24,7 +23,7 @@
 }
 
 
-def get_outer_html(html: str, start_idx: int) -> Optional[Tag]:
+def get_outer_html(html: str, start_idx: int) -> Tag | None:
     """Get the outer HTML for just the tag at a given index.
 
     Will not return HTML before the beginning of the tag or after the ending tag.
@@ -42,7 +41,7 @@ def get_outer_html(html: str, start_idx: int) -> Optional[Tag]:
         Tag: The tag at the given index. The outer HTML is set on `tag.outer_html`.
     """
 
-    initial_tag: Optional[Tag] = None
+    initial_tag: Tag | None = None
     idx = start_idx
     tag_html = ""
     tag_name = ""
@@ -108,8 +107,8 @@ def get_outer_html(html: str, start_idx: int) -> Optional[Tag]:
 def find_character(
     html: str,
     start_idx: int,
-    character: Optional[str] = None,
-    character_regex: Optional[str] = None,
+    character: str | None = None,
+    character_regex: str | None = None,
     *,
     reverse: bool = False,
 ) -> int:

src/dj_angles/mappers/mapper.py

@@ -1,6 +1,6 @@
 from collections import UserDict
 from collections.abc import Callable
-from typing import Optional, Union
+from typing import Optional
 
 from django.utils.module_loading import import_string
 
@@ -10,7 +10,7 @@
 from dj_angles.modules import is_module_available
 from dj_angles.settings import get_setting
 
-TAG_NAME_TO_DJANGO_TEMPLATE_TAG_MAP: dict[Optional[str], Union[Callable, str]] = {
+TAG_NAME_TO_DJANGO_TEMPLATE_TAG_MAP: dict[str | None, Callable | str] = {
     "extends": map_extends,
     "block": map_block,
     "verbatim": "verbatim",
@@ -43,7 +43,7 @@ class TagMap(UserDict):
     def __init__(self) -> None:
         super().__init__()
 
-        self.data: dict[Optional[str], Union[Callable, str]] = TAG_NAME_TO_DJANGO_TEMPLATE_TAG_MAP.copy()
+        self.data: dict[str | None, Callable | str] = TAG_NAME_TO_DJANGO_TEMPLATE_TAG_MAP.copy()
 
         # Add bird if installed
         self.add_module_mapper("django_bird", "bird", "dj_angles.mappers.map_bird")
@@ -86,7 +86,7 @@ def import_strings(self):
                 except ImportError:
                     pass
 
-    def add_module_mapper(self, module: str, tag_name: str, mapper: Union[str, Callable]) -> None:
+    def add_module_mapper(self, module: str, tag_name: str, mapper: str | Callable) -> None:
         """Add module mappers depending on whether the module is installed or not."""
 
         if is_module_available(module):

src/dj_angles/templates.py

@@ -1,13 +1,11 @@
-from typing import Optional
-
 from django.template import Template
 from django.template.exceptions import TemplateDoesNotExist
 from django.template.loader import select_template
 
 from dj_angles.strings import dequotify
 
 
-def get_template(template_file: str) -> Optional[Template]:
+def get_template(template_file: str) -> Template | None:
     """Check for the template file by looking for different template file variations.
 
     Currently, the only other variation is looking for the template file with an underscore

src/dj_angles/templatetags/dj_angles.py

@@ -1,5 +1,4 @@
 from datetime import date, datetime, time
-from typing import Union
 
 from django import template
 
@@ -11,7 +10,7 @@
 
 
 @register.filter(name="dateformat")
-def dateformat(value: Union[datetime, date, time], date_format: str):
+def dateformat(value: datetime | date | time, date_format: str):
     return value.strftime(date_format)