codeannotations

Author: regisb

code_annotations/annotation_errors.py

@@ -1,7 +1,6 @@
 """
 List possible annotation error types.
 """
-import typing as t
 from collections import namedtuple
 
 AnnotationError = namedtuple(
@@ -12,8 +11,6 @@
 # to expose errors to pylint.
 TYPES: list[AnnotationError] = []
 
-T = t.TypeVar('T', bound=AnnotationError)
-
 
 def add_error_type(message: str, symbol: str, description: str) -> AnnotationError:
     """

code_annotations/find_django.py

@@ -4,6 +4,7 @@
 
 import inspect
 import os
+import re
 import sys
 import typing as t
 
@@ -28,8 +29,8 @@ def __init__(self, config: AnnotationConfig, app_name: str | None = None) -> Non
         Initialize for DjangoSearch.
         """
         super().__init__(config)
-        self.local_models: t.Set[t.Type[models.Model]]
-        self.non_local_models: t.Set[t.Type[models.Model]]
+        self.local_models: set[t.Type[models.Model]]
+        self.non_local_models: set[t.Type[models.Model]]
         self.local_models, self.non_local_models, total, annotation_eligible = (
             self.get_models_requiring_annotations(app_name)
         )
@@ -127,7 +128,7 @@ def _append_model_annotations(
         self,
         model_type: t.Type[models.Model],
         model_id: str,
-        query: t.Pattern[str],
+        query: re.Pattern[str],
         model_annotations: list[dict[str, t.Any]]
     ) -> None:
         """
@@ -448,8 +449,8 @@ def setup_django() -> None:
     def get_models_requiring_annotations(
         app_name: str | None = None
     ) -> tuple[
-        t.Set[t.Type[models.Model]],
-        t.Set[t.Type[models.Model]],
+        set[t.Type[models.Model]],
+        set[t.Type[models.Model]],
         int,
         list[str]
     ]:
@@ -468,8 +469,8 @@ def get_models_requiring_annotations(
             Tuple of local models, non-local models, total model count, and annotation eligible model IDs
         """
         DjangoSearch.setup_django()
-        local_models: t.Set[t.Type[models.Model]] = set()
-        non_local_models: t.Set[t.Type[models.Model]] = set()
+        local_models: set[t.Type[models.Model]] = set()
+        non_local_models: set[t.Type[models.Model]] = set()
         annotation_eligible_models: list[str] = []
         total_models = 0
 

code_annotations/helpers.py

@@ -121,7 +121,7 @@ def clean_abs_path(filename_to_clean: str, parent_path: str) -> str:
     return os.path.relpath(filename_to_clean, parent_path)
 
 
-def get_annotation_regex(annotation_regexes: list[str]) -> t.Pattern[str]:
+def get_annotation_regex(annotation_regexes: list[str]) -> re.Pattern[str]:
     """
     Return the full regex to search inside comments for configured annotations.