clinicedc 2.0.4__py3-none-any.whl → 2.0.5__py3-none-any.whl

edc_randomization/randomization_list_verifier.py

@@ -59,17 +59,15 @@ class RandomizationListVerifier:
                     "Resolve this issue before using the system."
                 )
 
-            else:
-                if not self.randomizationlist_path or not self.randomizationlist_path.exists():
-                    self.messages.append(
-                        f"Randomization list file does not exist but SIDs "
-                        f"have been loaded. Expected file "
-                        f"{self.randomizationlist_path}. "
-                        f"Resolve this issue before using the system."
-                    )
-                else:
-                    if message := self.verify():
-                        self.messages.append(message)
+            elif not self.randomizationlist_path or not self.randomizationlist_path.exists():
+                self.messages.append(
+                    f"Randomization list file does not exist but SIDs "
+                    f"have been loaded. Expected file "
+                    f"{self.randomizationlist_path}. "
+                    f"Resolve this issue before using the system."
+                )
+            elif message := self.verify():
+                self.messages.append(message)
         if self.messages:
             if (
                 "migrate" not in sys.argv
@@ -118,7 +116,7 @@ class RandomizationListVerifier:
                     f"{self.randomizationlist_path}. "
                     f"Resolve this issue before using the system. "
                     f"Problem started on line {index + 1}. "
-                    f'Got \'{row["sid"]}\' != \'{obj1.sid}\'.'
+                    f"Got '{row['sid']}' != '{obj1.sid}'."
                 )
             if not message:
                 assignment = self.get_assignment(row)
@@ -136,7 +134,7 @@ class RandomizationListVerifier:
                         f"does not match model data. See file "
                         f"{self.randomizationlist_path}. "
                         f"Resolve this issue before using the system. "
-                        f'Got \'{obj2.site_name}\' != \'{row["site_name"]}\' '
+                        f"Got '{obj2.site_name}' != '{row['site_name']}' "
                         f"for sid={obj2.sid}."
                     )
         return message

edc_randomization/randomizer.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import warnings
 from datetime import datetime
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Type
+from typing import TYPE_CHECKING, Any
 
 from django.apps import apps as django_apps
 from django.conf import settings
@@ -195,7 +195,7 @@ class Randomizer:
         return {self.identifier_attr: getattr(self, self.identifier_attr)}
 
     @classmethod
-    def get_registration_model_cls(cls) -> Type[RegisteredSubject]:
+    def get_registration_model_cls(cls) -> type[RegisteredSubject]:
         return get_registered_subject_model_cls()
 
     @property

edc_randomization/system_checks.py

@@ -1,7 +1,6 @@
 import os
 import sys
 from dataclasses import dataclass
-from typing import Type
 
 from django.conf import settings
 from django.core.checks import Error, Warning
@@ -15,7 +14,7 @@ from .site_randomizers import site_randomizers
 @dataclass(frozen=True)
 class Err:
     id: str
-    cls: Type[Warning | Error]
+    cls: type[Warning | Error]
 
 
 error_configs = dict(

edc_randomization/utils.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import csv
 import os
-from typing import Any, Optional
+from typing import Any
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
@@ -93,9 +93,9 @@ def generate_fake_randomization_list(
     all_sites=None,
     country=None,
     site_name=None,
-    assignment: Optional[list] = None,
-    slots: Optional[int] = None,
-    write_header: Optional[bool] = None,
+    assignment: list | None = None,
+    slots: int | None = None,
+    write_header: bool | None = None,
     filename=None,
     assignment_map=None,
 ):
@@ -137,7 +137,7 @@ def generate_fake_randomization_list(
 
 
 def export_randomization_list(
-    randomizer_name: str, path: Optional[str] = None, username: Optional[str] = None
+    randomizer_name: str, path: str | None = None, username: str | None = None
 ):
     randomizer_cls = site_randomizers.get(randomizer_name)
 

edc_refusal/admin.py

@@ -70,5 +70,5 @@ class SubjectRefusalAdmin(
             if callable(super().view_on_site):
                 url = super().view_on_site(obj)
             else:
-                raise NoReverseMatch(f"{e}. See subject_dashboard_url_name for {repr(self)}.")
+                raise NoReverseMatch(f"{e}. See subject_dashboard_url_name for {self!r}.")
         return url

edc_refusal/model_mixins.py

@@ -29,7 +29,7 @@ class SubjectRefusalModelMixin(models.Model):
         return self.screening_identifier
 
     def natural_key(self):
-        return (self.screening_identifier,)  # noqa
+        return (self.screening_identifier,)
 
     @staticmethod
     def get_search_slug_fields():

edc_refusal/utils.py

@@ -5,7 +5,7 @@ from .model_mixins import SubjectRefusalModelMixin
 
 
 def get_subject_refusal_model() -> str:
-    return getattr(settings, "SUBJECT_REFUSAL_MODEL")
+    return settings.SUBJECT_REFUSAL_MODEL
 
 
 def get_subject_refusal_model_cls() -> SubjectRefusalModelMixin:

edc_registration/model_mixins/updates_or_creates_registered_subject_model_mixin.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
@@ -23,7 +23,7 @@ class UpdatesOrCreatesRegistrationModelMixin(models.Model):
     """
 
     @property
-    def registration_model(self) -> Type[RegisteredSubject]:
+    def registration_model(self) -> type[RegisteredSubject]:
         """Returns the Registration model"""
         return get_registered_subject_model_cls()
 

edc_registration/modeladmin_mixins.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django_audit_fields.admin import audit_fields
 
@@ -25,11 +23,10 @@ class RegisteredSubjectModelAdminMixin(ModelAdminSubjectDashboardMixin, admin.Mo
         if self.fieldsets:
             if self.show_pii(request):
                 return self.fieldsets
-            else:
-                return self.fieldsets_no_pii
+            return self.fieldsets_no_pii
         return [(None, {"fields": self.get_fields(request, obj)})]
 
-    def get_readonly_fields(self, request, obj=None) -> Tuple[str, ...]:
+    def get_readonly_fields(self, request, obj=None) -> tuple[str, ...]:
         readonly_fields = super().get_readonly_fields(request, obj=obj)
         return (
             readonly_fields
@@ -85,7 +82,7 @@ class RegisteredSubjectModelAdminMixin(ModelAdminSubjectDashboardMixin, admin.Mo
             )
         return custom_fields + tuple(f for f in list_display if f not in custom_fields)
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = super().get_list_filter(request)
         custom_fields = (
             "subject_type",
@@ -98,7 +95,7 @@ class RegisteredSubjectModelAdminMixin(ModelAdminSubjectDashboardMixin, admin.Mo
         )
         return custom_fields + tuple(f for f in list_filter if f not in custom_fields)
 
-    def get_search_fields(self, request) -> Tuple[str, ...]:
+    def get_search_fields(self, request) -> tuple[str, ...]:
         search_fields = super().get_search_fields(request)
         pii_fields = (
             "first_name",

edc_registration/models/registered_subject.py

@@ -44,9 +44,7 @@ class RegisteredSubject(UniqueSubjectIdentifierModelMixin, SiteModelMixin, BaseU
         validators=[
             RegexValidator(
                 regex=r"^[A-Z]{2,3}$",
-                message=(
-                    "Ensure initials consist of letters " "only in upper case, no spaces."
-                ),
+                message=("Ensure initials consist of letters only in upper case, no spaces."),
             )
         ],
         null=True,
@@ -154,7 +152,7 @@ class RegisteredSubject(UniqueSubjectIdentifierModelMixin, SiteModelMixin, BaseU
         super().save(*args, **kwargs)
 
     def natural_key(self):
-        return (self.subject_identifier_as_pk,)  # noqa
+        return (self.subject_identifier_as_pk,)
 
     def __str__(self):
         return self.masked_subject_identifier
@@ -228,10 +226,9 @@ class RegisteredSubject(UniqueSubjectIdentifierModelMixin, SiteModelMixin, BaseU
                     ).get(**{attrname: getattr(self, attrname)})
                     if not self.id:
                         raise RegisteredSubjectError(error_msg.format(action="insert"))
-                    elif self.subject_identifier_is_set and obj.id != self.id:
-                        raise RegisteredSubjectError(error_msg.format(action="update"))
-                    else:
+                    if self.subject_identifier_is_set and obj.id != self.id:
                         raise RegisteredSubjectError(error_msg.format(action="update"))
+                    raise RegisteredSubjectError(error_msg.format(action="update"))
                 except ObjectDoesNotExist:
                     pass
 
@@ -255,10 +252,11 @@ class RegisteredSubject(UniqueSubjectIdentifierModelMixin, SiteModelMixin, BaseU
                 name="%(app_label)s_%(class)s_first_name_uniq",
             )
         ]
-        indexes = BaseUuidModel.Meta.indexes + [
+        indexes = (
+            *BaseUuidModel.Meta.indexes,
             models.Index(fields=["first_name", "dob", "initials", "additional_key"]),
             models.Index(fields=["subject_identifier", "identity", "screening_identifier"]),
-        ]
+        )
         permissions = (
             ("display_firstname", "Can display first name"),
             ("display_lastname", "Can display last name"),

edc_registration/utils.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import re
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.conf import settings
@@ -27,7 +27,7 @@ def get_registered_subject_model_name() -> str:
     )
 
 
-def get_registered_subject_model_cls() -> Type[RegisteredSubject]:
+def get_registered_subject_model_cls() -> type[RegisteredSubject]:
     return django_apps.get_model(get_registered_subject_model_name())
 
 
@@ -62,6 +62,5 @@ def valid_subject_identifier_or_raise(
                 f"See `edc_protocol.ResearchProtocolConfig().subject_identifier_pattern`. "
                 f"Got `{subject_identifier}`."
             )
-        else:
-            return False
+        return False
     return True

edc_reportable/data/grading_data/daids_july_2017.py

@@ -33,12 +33,12 @@ from ...units import (
 )
 
 __all__ = [
-    "dummies",
     "chemistries",
+    "dummies",
+    "grading_data",
+    "hba1c",
     "hematology",
     "urinalysis",
-    "hba1c",
-    "grading_data",
 ]
 
 dummies = {

edc_reportable/evaluator.py

@@ -94,8 +94,8 @@ class Evaluator:
         if upper and upper >= float(HIGH_VALUE):
             upper = ""
         return (
-            f'{lower}{self.lower_operator or ""}{value}'
-            f'{self.upper_operator or ""}{upper} {self.units}'
+            f"{lower}{self.lower_operator or ''}{value}"
+            f"{self.upper_operator or ''}{upper} {self.units}"
         )
 
     def in_bounds_or_raise(self, value: int | float, units: str = None) -> bool:
@@ -111,10 +111,10 @@ class Evaluator:
         """
         value = float(value)
         if units != self.units:
-            raise InvalidUnits(f"Expected {self.units}. See {repr(self)}")
+            raise InvalidUnits(f"Expected {self.units}. See {self!r}")
         condition_str = (
-            f'{"" if self.lower is None else self.lower}{self.lower_operator or ""}{value}'
-            f'{self.upper_operator or ""}{"" if self.upper is None else self.upper}'
+            f"{'' if self.lower is None else self.lower}{self.lower_operator or ''}{value}"
+            f"{self.upper_operator or ''}{'' if self.upper is None else self.upper}"
         )
         if not eval(condition_str):  # nosec B307
             raise ValueBoundryError(condition_str)

edc_reportable/formula.py

@@ -7,7 +7,7 @@ from edc_constants.constants import FEMALE, MALE
 
 from .adult_age_options import adult_age_options
 
-__all__ = ["Formula", "formula", "dummy_formula", "FormulaError"]
+__all__ = ["Formula", "FormulaError", "dummy_formula", "formula"]
 
 from .exceptions import FormulaError
 

edc_reportable/reference_range_evaluator.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from datetime import date, datetime
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django import forms
 from django.apps import apps as django_apps
@@ -77,11 +77,11 @@ class ReferenceRangeEvaluator:
         return self.reference_range_collection.grades(utest_id)
 
     @property
-    def reference_range_collection_model_cls(self) -> Type[ReferenceRangeCollection]:
+    def reference_range_collection_model_cls(self) -> type[ReferenceRangeCollection]:
         return django_apps.get_model("edc_reportable.referencerangecollection")
 
     @property
-    def normal_data_model_cls(self) -> Type[NormalData]:
+    def normal_data_model_cls(self) -> type[NormalData]:
         return django_apps.get_model("edc_reportable.normaldata")
 
     def validate_reportable_fields(self):

edc_reportable/utils/convert_units.py

@@ -34,14 +34,13 @@ def micromoles_per_liter_to(
 ) -> dict:
     if units_to == MICROMOLES_PER_LITER:
         return {MICROMOLES_PER_LITER: float(value)}
-    elif units_to == MILLIMOLES_PER_LITER:
+    if units_to == MILLIMOLES_PER_LITER:
         return {MILLIMOLES_PER_LITER: float(value) / 1000.00}
-    elif units_to == GRAMS_PER_LITER:
+    if units_to == GRAMS_PER_LITER:
         return {GRAMS_PER_LITER: (float(value) * get_mw(label)) / 100.00}
-    elif units_to == MILLIGRAMS_PER_DECILITER:
+    if units_to == MILLIGRAMS_PER_DECILITER:
         return {MILLIGRAMS_PER_DECILITER: (float(value) * get_mw(label)) / 10000.00}
-    else:
-        raise ConversionNotHandled(f"Conversion not found. Tried umol/L to {units_to}. ")
+    raise ConversionNotHandled(f"Conversion not found. Tried umol/L to {units_to}. ")
 
 
 def milligrams_per_deciliter_to(
@@ -49,16 +48,15 @@ def milligrams_per_deciliter_to(
 ) -> dict[str:float]:
     if units_to == MILLIGRAMS_PER_DECILITER:
         return {MILLIGRAMS_PER_DECILITER: float(value)}
-    elif units_to == MILLIMOLES_PER_LITER:
+    if units_to == MILLIMOLES_PER_LITER:
         return {MILLIMOLES_PER_LITER: (float(value) * 10.00) / get_mw(label)}
-    elif units_to == MICROMOLES_PER_LITER:
+    if units_to == MICROMOLES_PER_LITER:
         return {MICROMOLES_PER_LITER: (float(value) * 10000.00) / get_mw(label)}
-    elif units_to == MILLIGRAMS_PER_LITER:
+    if units_to == MILLIGRAMS_PER_LITER:
         return {MILLIGRAMS_PER_LITER: float(value) * 10.00}
-    elif units_to == GRAMS_PER_LITER:
+    if units_to == GRAMS_PER_LITER:
         return {GRAMS_PER_LITER: float(value) / 100.00}
-    else:
-        raise ConversionNotHandled(f"Conversion not found. Tried mg/dL to {units_to}. ")
+    raise ConversionNotHandled(f"Conversion not found. Tried mg/dL to {units_to}. ")
 
 
 class UnitsConverter:
@@ -79,7 +77,7 @@ class UnitsConverter:
 
         if label is None:
             raise ValueError("label is required. See convert_units.")
-        elif value is not None and units_from and units_to and units_from != units_to:
+        if value is not None and units_from and units_to and units_from != units_to:
             self.converted_value = self.get_converted_value()
         elif units_from == units_to:
             self.converted_value = value

edc_reportable/utils/grading_data_model_cls.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 
@@ -10,5 +10,5 @@ if TYPE_CHECKING:
 __all__ = ["grading_data_model_cls"]
 
 
-def grading_data_model_cls() -> Type[GradingData]:
+def grading_data_model_cls() -> type[GradingData]:
     return django_apps.get_model("edc_reportable.gradingdata")

edc_reportable/utils/grading_exception_model_cls.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 
@@ -10,5 +10,5 @@ if TYPE_CHECKING:
 __all__ = ["grading_exception_model_cls"]
 
 
-def grading_exception_model_cls() -> Type[GradingException]:
+def grading_exception_model_cls() -> type[GradingException]:
     return django_apps.get_model("edc_reportable.gradingexception")

edc_reportable/utils/molecular_weight_model_cls.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 
@@ -8,5 +8,5 @@ if TYPE_CHECKING:
     from edc_reportable.models import MolecularWeight
 
 
-def molecular_weight_model_cls() -> Type[MolecularWeight]:
+def molecular_weight_model_cls() -> type[MolecularWeight]:
     return django_apps.get_model("edc_reportable", "MolecularWeight")

edc_reportable/utils/normal_data_model_cls.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 
@@ -11,5 +11,5 @@ if TYPE_CHECKING:
 __all__ = ["normal_data_model_cls"]
 
 
-def normal_data_model_cls() -> Type[NormalData]:
+def normal_data_model_cls() -> type[NormalData]:
     return django_apps.get_model("edc_reportable.normaldata")

edc_reportable/utils/reference_range_colllection_model_cls.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 
@@ -11,5 +11,5 @@ if TYPE_CHECKING:
 __all__ = ["reference_range_colllection_model_cls"]
 
 
-def reference_range_colllection_model_cls() -> Type[ReferenceRangeCollection]:
+def reference_range_colllection_model_cls() -> type[ReferenceRangeCollection]:
     return django_apps.get_model("edc_reportable.referencerangecollection")

edc_screening/age_evaluator.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from dateutil.relativedelta import relativedelta
 from django.utils.timezone import localtime
 
@@ -10,10 +8,10 @@ from edc_utils.date import get_utcnow
 
 class AgeEvaluator(ReportableAgeEvaluator):
     def __init__(self, **kwargs) -> None:
-        self.reasons_ineligible: Optional[str] = None
+        self.reasons_ineligible: str | None = None
         super().__init__(**kwargs)
 
-    def eligible(self, age: Optional[int] = None) -> bool:
+    def eligible(self, age: int | None = None) -> bool:
         self.reasons_ineligible = None
         eligible = False
         if age:

edc_screening/eligibility.py

@@ -77,6 +77,6 @@ class Eligibility:
                 raise EligibilityError(
                     f"Custom reasons refer to invalid named criteria, Got '{k}'. "
                     f"Expected one of {list(self.criteria)}. "
-                    f"See {repr(self)}."
+                    f"See {self!r}."
                 )
         return self.custom_reasons_dict

edc_screening/form_validator_mixins.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
@@ -33,7 +33,7 @@ class SubjectScreeningFormValidatorMixin:
         return get_subject_screening_model()
 
     @property
-    def subject_screening_model_cls(self) -> Type[ScreeningModelMixin]:
+    def subject_screening_model_cls(self) -> type[ScreeningModelMixin]:
         return django_apps.get_model(self.subject_screening_model)
 
     @property

edc_screening/model_mixins/screening_methods_model_mixin.py

@@ -12,7 +12,7 @@ class ScreeningMethodsModeMixin(models.Model):
         return f"{self.screening_identifier} {self.gender} {self.age_in_years}"
 
     def natural_key(self: SubjectScreeningModelStub):
-        return (self.screening_identifier,)  # noqa
+        return (self.screening_identifier,)
 
     @staticmethod
     def get_search_slug_fields():

edc_screening/screening_eligibility.py

@@ -20,7 +20,7 @@ if TYPE_CHECKING:
 
     from .model_mixins import EligibilityModelMixin, ScreeningModelMixin
 
-    class SubjectScreeningModel(ScreeningModelMixin, BaseUuidModel): ...  # noqa
+    class SubjectScreeningModel(ScreeningModelMixin, BaseUuidModel): ...
 
 
 __all__ = ["ScreeningEligibility"]

edc_screening/utils.py

@@ -26,7 +26,7 @@ def get_subject_screening_app_label() -> str:
 
 
 def get_subject_screening_model() -> str:
-    return getattr(settings, "SUBJECT_SCREENING_MODEL")
+    return settings.SUBJECT_SCREENING_MODEL
 
 
 def get_subject_screening_model_cls() -> Any:
@@ -74,11 +74,9 @@ def get_subject_screening_or_raise(
     except ObjectDoesNotExist as e:
         if is_modelform:
             raise forms.ValidationError("Not allowed. Screening form not found.")
-        else:
-            raise ObjectDoesNotExist(
-                f"{e} screening_identifier={screening_identifier}. "
-                "Perhaps catch this in the form."
-            )
+        raise ObjectDoesNotExist(
+            f"{e} screening_identifier={screening_identifier}. Perhaps catch this in the form."
+        )
     return subject_screening
 
 

edc_search/model_mixins.py

@@ -42,4 +42,4 @@ class SearchSlugModelMixin(models.Model):
 
     class Meta:
         abstract = True
-        indexes = [models.Index(fields=["slug"])]
+        indexes = (models.Index(fields=["slug"]),)

edc_search/search_slug.py

@@ -37,9 +37,7 @@ class SearchSlug:
             slugs = [slugify(item or "") for item in values]
             slug = SEARCH_SLUG_SEP.join(slugs)
             if len(slug) > 250:
-                self.warning = (
-                    f"Warning! Search slug string exceeds 250 chars. See {repr(obj)}\n"
-                )
+                self.warning = f"Warning! Search slug string exceeds 250 chars. See {obj!r}\n"
                 sys.stdout.write(style.WARNING(self.warning))
             self.slug = slug[:250]
 

edc_search/updater.py

@@ -23,7 +23,7 @@ class SearchSlugUpdater:
     def __init__(self, fields: list[str], model_obj: Model | SearchSlugModelMixin = None):
         if len(fields) > len(list(set(fields))):
             raise SearchSlugDuplicateFields(
-                f"Duplicate search slug fields detected. Got {fields}. " f"See {repr(self)}"
+                f"Duplicate search slug fields detected. Got {fields}. See {self!r}"
             )
         search_slug = self.search_slug_cls(obj=model_obj, fields=fields)
         self.warning = search_slug.warning

edc_sites/admin/site_model_admin_mixin.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import collections
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.contrib import admin
 from django.contrib.auth import get_permission_codename
@@ -68,7 +68,7 @@ class SiteModelAdminMixin:
             return obj.site.name
         return f"{site_profile.site.id} {site_profile.description}"
 
-    def get_list_filter(self, request) -> tuple[str | Type[SimpleListFilter], ...]:
+    def get_list_filter(self, request) -> tuple[str | type[SimpleListFilter], ...]:
         """Insert `SiteListFilter` before field name `created`.
 
         Remove site from the list if user does not have access

edc_sites/model_mixins/site_model_mixin.py

@@ -36,7 +36,6 @@ class SiteModelMixin(models.Model):
             pass
         else:
             self.validate_site_against_current()
-        return None
 
     def get_site_on_create(self) -> Site:
         """Returns a site model instance.
@@ -65,7 +64,7 @@ class SiteModelMixin(models.Model):
 
     def validate_site_against_current(self) -> None:
         """Validate existing site instance matches current_site."""
-        return None
+        return
 
     class Meta:
         abstract = True

edc_sites/modelform_mixins.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django import forms
 from django.apps import apps as django_apps
@@ -32,7 +32,7 @@ class SiteModelFormMixin:
         return cleaned_data
 
     @property
-    def site_model_cls(self) -> Type[Site]:
+    def site_model_cls(self) -> type[Site]:
         return django_apps.get_model("sites.site")
 
     @property