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

edc_lab_dashboard/view_mixins/box_view_mixin.py

@@ -74,9 +74,7 @@ class BoxViewMixin(ContextMixin):
                         box=self.box, identifier=self.box_item_identifier
                     )
                 except ObjectDoesNotExist:
-                    message = "Invalid box item. Got {}".format(
-                        self.original_box_item_identifier
-                    )
+                    message = f"Invalid box item. Got {self.original_box_item_identifier}"
                     messages.error(self.request, message)
         return self._box_item
 
@@ -85,7 +83,7 @@ class BoxViewMixin(ContextMixin):
         try:
             box_item = BoxItem.objects.get(box=self.box, position=position)
         except ObjectDoesNotExist:
-            message = "Invalid position for box. Got {}".format(position)
+            message = f"Invalid position for box. Got {position}"
             messages.error(self.request, message)
             return None
         return box_item
@@ -103,15 +101,12 @@ class BoxViewMixin(ContextMixin):
             # raise BoxViewError(message)
         else:
             if obj.is_primary and not self.box.accept_primary:
-                message = 'Box does not accept "primary" specimens. Got {} is primary.'.format(
-                    self.original_box_item_identifier
-                )
+                message = f'Box does not accept "primary" specimens. Got {self.original_box_item_identifier} is primary.'
                 messages.error(self.request, message)
                 # raise BoxViewError(message)
             elif obj.numeric_code not in self.box.specimen_types.split(","):
                 message = (
-                    "Invalid specimen type. Box accepts types {}. "
-                    "Got {} is type {}.".format(
+                    "Invalid specimen type. Box accepts types {}. Got {} is type {}.".format(
                         ", ".join(self.box.specimen_types.split(",")),
                         self.original_box_item_identifier,
                         obj.numeric_code,

edc_lab_dashboard/views/action_views/action_view.py

@@ -60,8 +60,7 @@ class ActionView(TemplateView):
         action = slugify(self.request.POST.get("action", "").lower())
         if action not in self.valid_form_actions:
             raise InvalidPostError(f"Invalid form action in POST. Got {action}")
-        else:
-            self.action = action
+        self.action = action
         self.process_form_action(request=request)
         url_name = url_names.get(self.post_action_url)
         url = reverse(url_name, kwargs=self.url_kwargs)

edc_lab_dashboard/views/action_views/manage_manifest_view.py

@@ -47,7 +47,7 @@ class ManageManifestView(EdcViewMixin, ManifestViewMixin, ActionView):
                 deleted = ManifestItem.objects.filter(
                     pk__in=self.selected_items, manifest__shipped=False
                 ).delete()
-                message = "{} items have been removed.".format(deleted[0])
+                message = f"{deleted[0]} items have been removed."
                 messages.success(self.request, message)
             except ProtectedError:
                 message = "Unable to remove. Manifest is not empty."

edc_lab_dashboard/views/action_views/manifest_view.py

@@ -24,15 +24,14 @@ class ManifestView(EdcViewMixin, ManifestViewMixin, LabPrintersMixin, ActionView
         if not self.selected_items:
             message = "Nothing to do. No items have been selected."
             messages.warning(request, message)
-        else:
-            if self.action == "remove_selected_items":
-                self.remove_selected_items()
-            elif self.action == "print_labels":
-                job_result = self.print_labels(pks=self.selected_items, request=request)
-                if job_result:
-                    add_job_results_to_messages(request, [job_result])
-            elif self.action == "ship_selected_items":
-                self.ship_selected_items()
+        elif self.action == "remove_selected_items":
+            self.remove_selected_items()
+        elif self.action == "print_labels":
+            job_result = self.print_labels(pks=self.selected_items, request=request)
+            if job_result:
+                add_job_results_to_messages(request, [job_result])
+        elif self.action == "ship_selected_items":
+            self.ship_selected_items()
 
     def remove_selected_items(self):
         """Deletes the selected items, if allowed."""
@@ -51,8 +50,7 @@ class ManifestView(EdcViewMixin, ManifestViewMixin, LabPrintersMixin, ActionView
         for manifest in Manifest.objects.filter(pk__in=self.selected_items):
             if manifest.shipped:
                 message = (
-                    f"Manifest has already been shipped. "
-                    f"Got {manifest.manifest_identifier}."
+                    f"Manifest has already been shipped. Got {manifest.manifest_identifier}."
                 )
                 messages.error(self.request, message)
             else:

edc_lab_dashboard/views/action_views/pack_view.py

@@ -29,16 +29,15 @@ class PackView(EdcViewMixin, LabPrintersMixin, ActionView):
         if not self.selected_items:
             message = "Nothing to do. No items have been selected."
             messages.warning(request, message)
-        else:
-            if self.action == "remove_selected_items":
-                self.remove_selected_items()
-            elif self.action == "add_selected_to_manifest":
-                if self.selected_manifest:
-                    self.add_selected_to_manifest()
-            elif self.action == "print_labels":
-                job_result = self.print_labels(pks=self.selected_items, request=request)
-                if job_result:
-                    add_job_results_to_messages(request, [job_result])
+        elif self.action == "remove_selected_items":
+            self.remove_selected_items()
+        elif self.action == "add_selected_to_manifest":
+            if self.selected_manifest:
+                self.add_selected_to_manifest()
+        elif self.action == "print_labels":
+            job_result = self.print_labels(pks=self.selected_items, request=request)
+            if job_result:
+                add_job_results_to_messages(request, [job_result])
 
     @property
     def selected_manifest(self):
@@ -77,9 +76,7 @@ class PackView(EdcViewMixin, LabPrintersMixin, ActionView):
                     else:
                         break
                 if added > 0:
-                    message = "{} items have been added to manifest {}.".format(
-                        added, self.selected_manifest.human_readable_identifier
-                    )
+                    message = f"{added} items have been added to manifest {self.selected_manifest.human_readable_identifier}."
                     messages.success(self.request, message)
             except ProtectedError:
                 message = "Unable to remove. Box is not empty."
@@ -93,7 +90,7 @@ class PackView(EdcViewMixin, LabPrintersMixin, ActionView):
         else:
             try:
                 deleted = Box.objects.filter(pk__in=self.selected_items).delete()
-                message = "{} items have been removed.".format(deleted[0])
+                message = f"{deleted[0]} items have been removed."
                 messages.success(self.request, message)
             except ProtectedError:
                 message = "Unable to remove. Box is not empty."

edc_lab_results/calculate_missing.py

@@ -1,7 +1,7 @@
-from typing import Any, Optional, Tuple
+from typing import Any
 
 
-def calculate_missing(obj: Any, panel: Any) -> Tuple[int, Optional[str]]:
+def calculate_missing(obj: Any, panel: Any) -> tuple[int, str | None]:
     """Returns a tuple of (missing_count, missing)
 
     Counts the number of blank results within the model

edc_lab_results/fieldsets.py

@@ -1,23 +1,23 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Tuple
+from typing import TYPE_CHECKING, Any
 
 from django_audit_fields import audit_fieldset_tuple
 
 if TYPE_CHECKING:
     from edc_lab import RequisitionPanel
 
-panel_conclusion_fieldset: Tuple[str, dict] = (
+panel_conclusion_fieldset: tuple[str, dict] = (
     "Conclusion",
     {"fields": ("results_abnormal", "results_reportable")},
 )
-panel_summary_fieldset: Tuple[str, dict] = (
+panel_summary_fieldset: tuple[str, dict] = (
     "Summary",
     {"fields": ("reportable_summary", "abnormal_summary", "errors")},
 )
 
 
-calculate_egfr_fieldset: Tuple[str, dict] = (
+calculate_egfr_fieldset: tuple[str, dict] = (
     "Calculated eGFR",
     {
         # "classes": ("collapse",),
@@ -26,7 +26,7 @@ calculate_egfr_fieldset: Tuple[str, dict] = (
     },
 )
 
-calculate_egfr_drop_fieldset: Tuple[str, dict] = (
+calculate_egfr_drop_fieldset: tuple[str, dict] = (
     "Calculated eGFR Drop",
     {
         # "classes": ("collapse",),
@@ -50,7 +50,7 @@ class BloodResultFieldset:
         panel: RequisitionPanel,
         title: str = None,
         model_cls: Any = None,
-        extra_fieldsets: list[Tuple[int, Tuple[str, dict]]] | None = None,
+        extra_fieldsets: list[tuple[int, tuple[str, dict]]] | None = None,
         excluded_utest_ids: list[str] = None,
         exclude_units: bool = None,
         exclude_reportable: bool = None,

edc_lab_results/model_mixin_factories/__init__.py

@@ -3,8 +3,8 @@ from .reportable_result_model_mixin_factory import reportable_result_model_mixin
 from .result_model_mixin_factory import result_model_mixin_factory
 
 __all__ = [
+    "get_field_attrs_for_reportable",
+    "get_field_attrs_for_utestid",
     "reportable_result_model_mixin_factory",
     "result_model_mixin_factory",
-    "get_field_attrs_for_utestid",
-    "get_field_attrs_for_reportable",
 ]

edc_lab_results/model_mixin_factories/reportable_result_model_mixin_factory.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from django.db import models
 
 from .field_attrs import get_field_attrs_for_reportable, get_field_attrs_for_utestid
@@ -10,13 +8,13 @@ __all__ = ["reportable_result_model_mixin_factory"]
 def reportable_result_model_mixin_factory(
     utest_id: str,
     units_choices: tuple,
-    default_units: Optional[str] = None,
-    verbose_name: Optional[str] = None,
-    decimal_places: Optional[int] = None,
-    max_digits: Optional[int] = None,
-    validators: Optional[list] = None,
-    exclude_attrs_for_reportable: Optional[bool] = None,
-) -> Type[models.Model]:
+    default_units: str | None = None,
+    verbose_name: str | None = None,
+    decimal_places: int | None = None,
+    max_digits: int | None = None,
+    validators: list | None = None,
+    exclude_attrs_for_reportable: bool | None = None,
+) -> type[models.Model]:
     """Returns an abstract model class with a single field class"""
 
     class AbstractModel(models.Model):

edc_lab_results/model_mixin_factories/result_model_mixin_factory.py

@@ -1,5 +1,3 @@
-from typing import Optional, Type
-
 from django.db import models
 
 from .field_attrs import get_field_attrs_for_utestid
@@ -10,13 +8,13 @@ __all__ = ["result_model_mixin_factory"]
 def result_model_mixin_factory(
     utest_id: str,
     units_choices: tuple,
-    default_units: Optional[str] = None,
-    verbose_name: Optional[str] = None,
-    decimal_places: Optional[int] = None,
-    max_digits: Optional[int] = None,
-    validators: Optional[list] = None,
-    help_text: Optional[str] = None,
-) -> Type[models.Model]:
+    default_units: str | None = None,
+    verbose_name: str | None = None,
+    decimal_places: int | None = None,
+    max_digits: int | None = None,
+    validators: list | None = None,
+    help_text: str | None = None,
+) -> type[models.Model]:
     """Returns an abstract model class with a single field class"""
 
     class AbstractModel(models.Model):

edc_lab_results/model_mixins/fbg_model_mixin.py

@@ -54,7 +54,7 @@ class FbgModelMixin(
     )
 
     def get_summary_options(self) -> dict:
-        opts = super().get_summary_options()  # noqa
+        opts = super().get_summary_options()
         fasting = True if self.fasting == FASTING else False
         opts.update(fasting=fasting)
         return opts

edc_lab_results/model_mixins/glucose_model_mixin.py

@@ -51,7 +51,7 @@ class GlucoseModelMixin(
     )
 
     def get_summary_options(self: Any) -> dict:
-        opts = super().get_summary_options()  # noqa
+        opts = super().get_summary_options()
         fasting = True if self.fasting == FASTING else False
         opts.update(fasting=fasting)
         return opts

edc_label/admin.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django.contrib.admin import ModelAdmin
 from django_audit_fields import audit_fieldset_tuple
@@ -15,4 +13,4 @@ class ZplLabelTemplatesAdmin(ModelAdmin):
         audit_fieldset_tuple,
     )
 
-    search_fields: Tuple[str, ...] = ("name",)
+    search_fields: tuple[str, ...] = ("name",)

edc_label/label.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from django.utils import timezone
 
 from .label_template import LabelTemplate
@@ -14,8 +12,8 @@ class Label:
 
     def __init__(
         self,
-        label_template_name: Optional[str] = None,
-        static_files_path: Optional[str] = None,
+        label_template_name: str | None = None,
+        static_files_path: str | None = None,
     ):
         if label_template_name:
             self.label_template_name = label_template_name

edc_label/label_template.py

@@ -39,7 +39,7 @@ class LabelTemplate:
                     f"Looking for  template '{template_name}'. "
                     f"Got {path}. See edc_label.app_config."
                 )
-            with open(path, "r") as f:
+            with open(path) as f:
                 self.template = f.read()
         else:
             self.template = zpl_label_template.zpl_data.strip()

edc_label/subject_label.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from django.apps import apps as django_apps
 
 from edc_protocol.research_protocol_config import ResearchProtocolConfig
@@ -11,7 +9,7 @@ class SubjectLabel(Label):
     template_name = None
     registered_subject_model = "edc_registration.registeredsubject"
 
-    def __init__(self, subject_identifier: Optional[str] = None, site=None, **kwargs):
+    def __init__(self, subject_identifier: str | None = None, site=None, **kwargs):
         super().__init__(**kwargs)
         self._registered_subject = None
         self.subject_identifier = subject_identifier

edc_list_data/admin.py

@@ -1,13 +1,11 @@
-from typing import Tuple
-
 from django.contrib import admin
 
 from edc_model_admin.mixins import TemplatesModelAdminMixin
 
 
 class ListModelAdminMixin(TemplatesModelAdminMixin, admin.ModelAdmin):
-    ordering: Tuple[str, ...] = ("display_index", "display_name")
+    ordering: tuple[str, ...] = ("display_index", "display_name")
 
-    list_display: Tuple[str, ...] = ("display_name", "name", "display_index")
+    list_display: tuple[str, ...] = ("display_name", "name", "display_index")
 
-    search_fields: Tuple[str, ...] = ("display_name", "name")
+    search_fields: tuple[str, ...] = ("display_name", "name")

edc_list_data/load_list_data.py

@@ -27,7 +27,7 @@ def load_list_data(
     if model_name:
         model_names = [model_name]
     else:
-        model_names = [k for k in list_data.keys()]
+        model_names = [k for k in list_data]
     n = 0
     for model_name in model_names:
         try:

edc_list_data/load_model_data.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from django.apps import AppConfig
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
@@ -10,7 +8,7 @@ class LoadModelDataError(Exception):
     pass
 
 
-def load_model_data(model_data: dict, apps: Optional[AppConfig] = None) -> int:
+def load_model_data(model_data: dict, apps: AppConfig | None = None) -> int:
     """Loads data into a model, creates or updates existing.
 
     Must have a unique field

edc_list_data/model_mixins.py

@@ -54,13 +54,11 @@ class BaseListModelMixin(models.Model):
         super().save(*args, **kwargs)
 
     def natural_key(self) -> tuple:
-        return (self.name,)  # noqa
+        return (self.name,)
 
     class Meta:
         abstract = True
-        indexes = [
-            models.Index(fields=["display_index", "display_name"]),
-        ]
+        indexes = (models.Index(fields=["display_index", "display_name"]),)
         default_permissions = ("add", "change", "delete", "view", "export", "import")
 
 
@@ -104,4 +102,4 @@ class ListUuidModelMixin(BaseListModelMixin, BaseUuidModel):
 
     class Meta(BaseListModelMixin.Meta, BaseUuidModel.Meta):
         abstract = True
-        indexes = BaseListModelMixin.Meta.indexes + BaseUuidModel.Meta.indexes
+        indexes = (*BaseListModelMixin.Meta.indexes, *BaseUuidModel.Meta.indexes)

edc_list_data/preload_data.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from django.apps import AppConfig
 from django.core.management.color import color_style
 
@@ -26,8 +24,8 @@ class PreloadData:
         if self.model_data:
             self.item_count += self.load_model_data()
 
-    def load_list_data(self, model_name: str = None, apps: Optional[AppConfig] = None) -> int:
+    def load_list_data(self, model_name: str = None, apps: AppConfig | None = None) -> int:
         return load_list_data(self.list_data, model_name=model_name, apps=apps)
 
-    def load_model_data(self, apps: Optional[AppConfig] = None) -> int:
+    def load_model_data(self, apps: AppConfig | None = None) -> int:
         return load_model_data(self.model_data, apps=apps)

edc_list_data/site_list_data.py

@@ -50,13 +50,12 @@ class SiteListData:
         """Registers but does NOT `load` list_data."""
         if app_name and app_name in self.app_names:
             raise AlreadyLoaded(f"App already loaded. Got {app_name}.")
-        else:
-            self.app_names.append(app_name)
-            opts = copy.deepcopy(self._get_options(module))
-            sys.stdout.write(f"   - registered {self.module_name} from '{module.__name__}'\n")
-            if opts.get(self.module_name):
-                self._replace_list_data_or_raise_on_duplicate(module, opts)
-            self.registry[module.__name__] = opts
+        self.app_names.append(app_name)
+        opts = copy.deepcopy(self._get_options(module))
+        sys.stdout.write(f"   - registered {self.module_name} from '{module.__name__}'\n")
+        if opts.get(self.module_name):
+            self._replace_list_data_or_raise_on_duplicate(module, opts)
+        self.registry[module.__name__] = opts
 
     def load_data(self) -> None:
         """Calls `load` class with each list_data dictionary module to

edc_listboard/filters/listboard_filter.py

@@ -24,8 +24,8 @@ class ListboardFilter:
 
     def __repr__(self):
         return (
-            "{0.__class__.__name__}({0.name}, {0.label}, "
-            "exclude_filter={0.exclude_filter}, {0.default})".format(self)
+            f"{self.__class__.__name__}({self.name}, {self.label}, "
+            f"exclude_filter={self.exclude_filter}, {self.default})"
         )
 
     @property

edc_listboard/views/listboard_view.py

@@ -114,9 +114,7 @@ class BaseListboardView(SiteViewMixin, TemplateRequestContextMixin, ListView):
         Accepts `listboard_model` as a model class or label_lower.
         """
         if not self.get_listboard_model():
-            raise ListboardViewError(
-                f"Listboard model not declared. Got None. See {repr(self)}"
-            )
+            raise ListboardViewError(f"Listboard model not declared. Got None. See {self!r}")
         try:
             return django_apps.get_model(self.get_listboard_model())
         except (ValueError, AttributeError):

edc_locator/models.py

@@ -28,9 +28,9 @@ class SubjectLocator(
     def natural_key(self):
         return (self.subject_identifier,)
 
-    natural_key.dependencies = ["sites.Site"]
+    natural_key.dependencies = ("sites.Site",)
 
     class Meta(ActionModelMixin.Meta, BaseUuidModel.Meta):
         verbose_name = "Subject Locator"
         verbose_name_plural = "Subject Locators"
-        indexes = ActionModelMixin.Meta.indexes + BaseUuidModel.Meta.indexes
+        indexes = (*ActionModelMixin.Meta.indexes, *BaseUuidModel.Meta.indexes)

edc_locator/view_mixins/subject_locator_view_mixins.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Type
+from typing import TYPE_CHECKING, Any
 
 from django.apps import apps as django_apps
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
@@ -67,7 +67,7 @@ class SubjectLocatorViewMixin:
             action_cls(subject_identifier=subject_identifier)
 
     @property
-    def subject_locator_model_cls(self) -> Type[SubjectLocator]:
+    def subject_locator_model_cls(self) -> type[SubjectLocator]:
         return django_apps.get_model(self.subject_locator_model)
 
     @property

edc_ltfu/action_items.py

@@ -14,7 +14,7 @@ class LtfuAction(ActionWithNotification):
     name = LTFU_ACTION
     display_name = "Submit Loss to Follow Up Report"
     notification_display_name = "Loss to Follow Up Report"
-    parent_action_names = [VISIT_MISSED_ACTION]
+    parent_action_names = (VISIT_MISSED_ACTION,)
     show_link_to_changelist = True
     priority = HIGH_PRIORITY
 

edc_ltfu/model_mixins.py

@@ -59,7 +59,6 @@ class LtfuModelMixin(models.Model):
 
     home_visit_detail = models.TextField(
         verbose_name="If YES, provide any further details of the home visit",
-        null=True,
         blank=True,
     )
 
@@ -76,7 +75,6 @@ class LtfuModelMixin(models.Model):
             "If any, please give additional details of the "
             "circumstances that led to this decision."
         ),
-        null=True,
         blank=True,
     )
 

edc_ltfu/models.py

@@ -22,8 +22,8 @@ class Ltfu(
         verbose_name = "Loss to Follow Up"
         verbose_name_plural = "Loss to Follow Ups"
         indexes = (
-            NonUniqueSubjectIdentifierFieldMixin.Meta.indexes
-            + ActionModelMixin.Meta.indexes
-            + BaseUuidModel.Meta.indexes
-            + [models.Index(fields=["subject_identifier", "action_identifier", "site"])]
+            *NonUniqueSubjectIdentifierFieldMixin.Meta.indexes,
+            *ActionModelMixin.Meta.indexes,
+            *BaseUuidModel.Meta.indexes,
+            models.Index(fields=["subject_identifier", "action_identifier", "site"]),
         )

edc_metadata/admin/modeladmin_mixins.py

@@ -198,6 +198,6 @@ class MetadataModelAdminMixin(
     def get_view_on_site_url(self, obj=None):
         if obj is None or not self.view_on_site:
             return None
-        elif hasattr(obj, "get_absolute_url"):
+        if hasattr(obj, "get_absolute_url"):
             url = reverse(self.changelist_url)
             return f"{url}?q={obj.subject_identifier}"

edc_metadata/admin/requisition_metadata.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib import admin
 
 from ..admin_site import edc_metadata_admin
@@ -21,12 +19,12 @@ class RequisitionMetadataAdmin(MetadataModelAdminMixin):
         search_fields.append("panel_name")
         return tuple(search_fields)
 
-    def get_list_display(self, request) -> Tuple[str, ...]:
+    def get_list_display(self, request) -> tuple[str, ...]:
         list_display = list(super().get_list_display(request))
         list_display.insert(3, "panel_name")
         return tuple(list_display)
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = list(super().get_list_filter(request))
         list_filter.insert(1, "panel_name")
         return tuple(list_filter)

edc_metadata/metadata/crf_metadata_getter.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Type
-
 from .metadata_getter import MetadataGetter, MetadataValidator
 
 
@@ -12,4 +10,4 @@ class CrfMetadataValidator(MetadataValidator):
 class CrfMetadataGetter(MetadataGetter):
     metadata_model: str = "edc_metadata.crfmetadata"
 
-    metadata_validator_cls: Type[CrfMetadataValidator] = CrfMetadataValidator
+    metadata_validator_cls: type[CrfMetadataValidator] = CrfMetadataValidator

edc_metadata/metadata/requisition_metadata_getter.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Type
-
 from .metadata_getter import MetadataGetter, MetadataValidator
 
 
@@ -14,4 +12,4 @@ class RequisitionMetadataValidator(MetadataValidator):
 class RequisitionMetadataGetter(MetadataGetter):
     metadata_model: str = "edc_metadata.requisitionmetadata"
 
-    metadata_validator_cls: Type[RequisitionMetadataValidator] = RequisitionMetadataValidator
+    metadata_validator_cls: type[RequisitionMetadataValidator] = RequisitionMetadataValidator

edc_metadata/metadata_handler.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
@@ -48,7 +48,7 @@ class MetadataHandler:
         self.creator = self.creator_cls(related_visit=self.related_visit, update_keyed=True)
 
     @property
-    def metadata_model_cls(self) -> Type[CrfMetadata] | Type[RequisitionMetadata]:
+    def metadata_model_cls(self) -> type[CrfMetadata] | type[RequisitionMetadata]:
         return django_apps.get_model(self.metadata_model)
 
     @property

edc_metadata/metadata_helper/metadata_helper_mixin.py

@@ -13,7 +13,7 @@ if TYPE_CHECKING:
     from ..models import CrfMetadata, RequisitionMetadata
 else:
 
-    class VisitScheduleFieldsProtocol: ...  # noqa
+    class VisitScheduleFieldsProtocol: ...
 
 
 class MetadataHelperMixin(VisitScheduleFieldsProtocol):
@@ -30,8 +30,7 @@ class MetadataHelperMixin(VisitScheduleFieldsProtocol):
     def metadata_helper_instance(self):
         if self.metadata_helper_instance_attr:
             return getattr(self, self.metadata_helper_instance_attr)
-        else:
-            return self
+        return self
 
     @property
     def crf_metadata_exists(self) -> bool: