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

edc_appointment/creators/appointment_creator.py

@@ -86,26 +86,22 @@ class AppointmentCreator:
         try:
             if is_naive(timepoint_datetime):
                 raise ValueError(
-                    f"Naive datetime not allowed. {repr(self)}. " f"Got {timepoint_datetime}"
+                    f"Naive datetime not allowed. {self!r}. Got {timepoint_datetime}"
                 )
-            else:
-                self.timepoint_datetime = timepoint_datetime
+            self.timepoint_datetime = timepoint_datetime
         except AttributeError:
             raise AppointmentCreatorError(
-                f"Expected 'timepoint_datetime'. Got None. {repr(self)}."
+                f"Expected 'timepoint_datetime'. Got None. {self!r}."
             )
         # suggested_datetime (defaults to timepoint_datetime)
         # If provided, the rules for window period/rdelta relative
         # to timepoint_datetime still apply.
         if suggested_datetime and is_naive(suggested_datetime):
-            raise ValueError(
-                f"Naive datetime not allowed. {repr(self)}. " f"Got {suggested_datetime}"
-            )
-        else:
-            self.suggested_datetime = suggested_datetime or self.timepoint_datetime
+            raise ValueError(f"Naive datetime not allowed. {self!r}. Got {suggested_datetime}")
+        self.suggested_datetime = suggested_datetime or self.timepoint_datetime
         self.facility = facility or visit.facility
         if not self.facility:
-            raise AppointmentCreatorError(f"facility_name not defined. See {repr(visit)}")
+            raise AppointmentCreatorError(f"facility_name not defined. See {visit!r}")
         self.get_appointment()
 
     def __repr__(self):
@@ -217,7 +213,7 @@ class AppointmentCreator:
                 )
             except FacilityError as e:
                 raise CreateAppointmentDateError(
-                    f"{e} Visit={repr(self.visit)}. "
+                    f"{e} Visit={self.visit!r}. "
                     f"Try setting 'best_effort_available_datetime=True' on facility."
                 )
         else:

edc_appointment/creators/appointments_creator.py

@@ -84,7 +84,7 @@ class AppointmentsCreator:
                 facility = get_facility(visit.facility_name)
             except FacilityError as e:
                 raise CreateAppointmentError(
-                    f"{e} See {repr(visit)}. Got facility_name={visit.facility_name}"
+                    f"{e} See {visit!r}. Got facility_name={visit.facility_name}"
                 )
             appointment = self.update_or_create_appointment(
                 visit=visit,

edc_appointment/creators/unscheduled_appointment_creator.py

@@ -100,7 +100,7 @@ class UnscheduledAppointmentCreator:
                 f"schedule_name='{self.schedule_name}',"
                 f"visit_code='{self.visit_code}'" + "}"
             )
-        elif not value.allow_unscheduled:
+        if not value.allow_unscheduled:
             raise UnscheduledAppointmentNotAllowed(
                 f"Not allowed. Visit {self.visit_code} is not configured for "
                 "unscheduled appointments."
@@ -241,18 +241,17 @@ class UnscheduledAppointmentCreator:
                     "visit form is not submitted. "
                     f"Got appointment '{self.visit_code}.0'."
                 )
-            else:
-                if self._parent_appointment.appt_status not in [
-                    COMPLETE_APPT,
-                    INCOMPLETE_APPT,
-                ]:
-                    raise InvalidParentAppointmentStatusError(
-                        "Unable to create unscheduled appointment. An unscheduled "
-                        "appointment cannot be created if the parent appointment "
-                        "is 'new' or 'in progress'. Got appointment "
-                        f"'{self.visit_code}' is "
-                        f"{self._parent_appointment.get_appt_status_display().lower()}."
-                    )
+            if self._parent_appointment.appt_status not in [
+                COMPLETE_APPT,
+                INCOMPLETE_APPT,
+            ]:
+                raise InvalidParentAppointmentStatusError(
+                    "Unable to create unscheduled appointment. An unscheduled "
+                    "appointment cannot be created if the parent appointment "
+                    "is 'new' or 'in progress'. Got appointment "
+                    f"'{self.visit_code}' is "
+                    f"{self._parent_appointment.get_appt_status_display().lower()}."
+                )
 
         return self._parent_appointment
 

edc_appointment/form_validator_mixins/next_appointment_crf_form_validator_mixin.py

@@ -24,7 +24,6 @@ class NextAppointmentCrfFormValidatorMixin(FormValidator):
         super().__init__(**kwargs)
 
     def clean(self):
-
         self.required_if(
             NO,
             field="offschedule_today",
@@ -119,8 +118,7 @@ class NextAppointmentCrfFormValidatorMixin(FormValidator):
         except ValidationError as e:
             if e.message_dict.get("appt_datetime"):
                 raise ValidationError({"appt_date": e.message_dict["appt_datetime"]})
-            else:
-                raise
+            raise
 
     @property
     def appt_datetime(self) -> datetime:

edc_appointment/form_validator_mixins/window_period_form_validator_mixin.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING
 from dateutil.relativedelta import relativedelta
 from django.utils.translation import gettext as _
 
-from edc_utils import formatted_date, to_utc
+from edc_utils import formatted_date
 from edc_utils.date import floor_secs, to_local
 from edc_visit_schedule.exceptions import (
     ScheduledVisitWindowError,
@@ -38,7 +38,7 @@ class WindowPeriodFormValidatorMixin:
             and appointment.visit_code_sequence > 0
             and appointment.next
             and appointment.next.appt_status in [INCOMPLETE_APPT, COMPLETE_APPT]
-            and to_utc(proposed_appt_datetime) < appointment.next.appt_datetime
+            and to_local(proposed_appt_datetime) < to_local(appointment.next.appt_datetime)
         ):
             value = True
         return value
@@ -50,14 +50,15 @@ class WindowPeriodFormValidatorMixin:
         form_field: str,
     ):
         if proposed_appt_datetime:
-            proposed_appt_datetime = to_utc(proposed_appt_datetime)
             try:
                 appointment.schedule.datetime_in_window(
-                    timepoint_datetime=appointment.timepoint_datetime,
-                    dt=proposed_appt_datetime,
+                    timepoint_datetime=to_local(appointment.timepoint_datetime),
+                    dt=to_local(proposed_appt_datetime),
                     visit_code=appointment.visit_code,
                     visit_code_sequence=appointment.visit_code_sequence,
-                    baseline_timepoint_datetime=self.baseline_timepoint_datetime(appointment),
+                    baseline_timepoint_datetime=to_local(
+                        self.baseline_timepoint_datetime(appointment)
+                    ),
                 )
             except UnScheduledVisitWindowError:
                 if not self.ignore_window_period_for_unscheduled(

edc_appointment/form_validators/appointment_form_validator.py

@@ -236,10 +236,8 @@ class AppointmentFormValidator(
                     self.raise_validation_error(
                         {
                             "appt_datetime": (
-                                (
-                                    "Invalid. Cannot be before consent date. "
-                                    f"Got consented on {formatted_date}"
-                                )
+                                "Invalid. Cannot be before consent date. "
+                                f"Got consented on {formatted_date}"
                             )
                         },
                         INVALID_APPT_DATE,

edc_appointment/form_validators/utils.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Optional
+from typing import Any
 from zoneinfo import ZoneInfo
 
 from django.urls import reverse
@@ -16,7 +16,7 @@ def get_appointment_url(appointment_pk: str, subject_identifier: str) -> str:
         args=(appointment_pk,),
     )
     rev_url = (
-        f'{rev_url}?next={url_names.get("subject_dashboard_url")},'
+        f"{rev_url}?next={url_names.get('subject_dashboard_url')},"
         f"subject_identifier"
         f"&subject_identifier={subject_identifier}"
     )
@@ -27,7 +27,7 @@ def validate_appt_datetime_unique(
     form_validator: Any,
     appointment: Any,
     appt_datetime: datetime,
-    form_field: Optional[str] = None,
+    form_field: str | None = None,
 ):
     """Assert one visit report per day"""
     if appt_datetime:
@@ -45,7 +45,7 @@ def validate_appt_datetime_unique(
                 {form_field: "An appointment already exists for this date (M)"},
                 INVALID_ERROR,
             )
-        elif other_appts.count() == 1:
+        if other_appts.count() == 1:
             if appointment and other_appts[0].id != appointment.id:
                 appointment_url = get_appointment_url(
                     (

edc_appointment/managers.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Dict
+from typing import TYPE_CHECKING, Any
 
 from django.db import models, transaction
 from django.db.models.deletion import ProtectedError
@@ -43,7 +43,7 @@ class AppointmentManager(models.Manager):
         )
 
     @staticmethod
-    def get_query_options(**kwargs) -> Dict[Any]:
+    def get_query_options(**kwargs) -> dict[Any]:
         """Returns a dictionary or options.
 
         Dictionary is based on the appointment instance or everything
@@ -53,7 +53,7 @@ class AppointmentManager(models.Manager):
         schedule_name = kwargs.get("schedule_name")
         subject_identifier = kwargs.get("subject_identifier")
         visit_schedule_name = kwargs.get("visit_schedule_name")
-        options: Dict[Any] = dict(visit_code_sequence=0)
+        options: dict[Any] = dict(visit_code_sequence=0)
         try:
             options.update(
                 subject_identifier=appointment.subject_identifier,
@@ -76,7 +76,7 @@ class AppointmentManager(models.Manager):
                     f"Expected visit_schedule_name for schedule_name "
                     f"'{schedule_name}'. Got {visit_schedule_name}"
                 )
-            elif schedule_name:
+            if schedule_name:
                 options.update(schedule_name=schedule_name)
         return options
 

edc_appointment/model_mixins/appointment_methods_model_mixin.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type, TypeVar
+from typing import TYPE_CHECKING, TypeVar
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
@@ -48,7 +48,7 @@ class AppointmentMethodsModelMixin(models.Model):
         return get_related_visit_model_attr(cls)
 
     @classmethod
-    def related_visit_model_cls(cls: Appointment) -> Type[VisitModel]:
+    def related_visit_model_cls(cls: Appointment) -> type[VisitModel]:
         return getattr(cls, cls.related_visit_model_attr()).related.related_model
 
     @property

edc_appointment/model_mixins/appointment_model_mixin.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import uuid
 from datetime import datetime
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING
 from uuid import UUID
 
 from dateutil.relativedelta import relativedelta
@@ -67,7 +67,7 @@ class AppointmentModelMixin(
         return f"{self.subject_identifier} {self.visit_code}.{self.visit_code_sequence}"
 
     def save(self: Appointment, *args, **kwargs):
-        if not kwargs.get("update_fields", None):
+        if not kwargs.get("update_fields"):
             if self.id and is_baseline(instance=self):
                 visit_schedule = site_visit_schedules.get_visit_schedule(
                     self.visit_schedule_name
@@ -116,7 +116,7 @@ class AppointmentModelMixin(
         )
 
     @property
-    def str_pk(self: Appointment) -> Union[str, uuid.UUID]:
+    def str_pk(self: Appointment) -> str | uuid.UUID:
         if isinstance(self.id, UUID):
             return str(self.pk)
         return self.pk
@@ -193,7 +193,7 @@ class AppointmentModelMixin(
                 name="unique_%(app_label)s_%(class)s_200",
             ),
         ]
-        indexes = [
+        indexes = (
             models.Index(fields=["appt_datetime"]),
             models.Index(fields=["appt_status"]),
             models.Index(fields=["timepoint", "visit_code_sequence"]),
@@ -217,4 +217,4 @@ class AppointmentModelMixin(
                     "visit_code_sequence",
                 ]
             ),
-        ]
+        )

edc_appointment/model_mixins/window_period_model_mixin.py

@@ -20,7 +20,7 @@ class WindowPeriodModelMixin(models.Model):
     window_period_checks_enabled: bool = True
 
     def save(self: Any, *args, **kwargs) -> None:
-        if not kwargs.get("update_fields", None):
+        if not kwargs.get("update_fields"):
             self.raise_on_appt_datetime_not_in_window()
         super().save(*args, **kwargs)
 

edc_appointment/models/appointment.py

@@ -26,4 +26,4 @@ class Appointment(AppointmentModelMixin, SiteModelMixin, BaseUuidModel):
     natural_key.dependencies = ["sites.Site"]  # type: ignore
 
     class Meta(AppointmentModelMixin.Meta, SiteModelMixin.Meta, BaseUuidModel.Meta):
-        indexes = AppointmentModelMixin.Meta.indexes + BaseUuidModel.Meta.indexes
+        indexes = (*AppointmentModelMixin.Meta.indexes, *BaseUuidModel.Meta.indexes)

edc_appointment/skip_appointments.py

@@ -177,12 +177,11 @@ class SkipAppointments:
             raise AppointmentAlreadyStarted(
                 f"Unable update as next. Appointment already started. Got {appointment}."
             )
-        else:
-            appointment.appt_status = NEW_APPT
-            appointment.appt_datetime = self.next_appt_datetime
-            appointment.comment = ""
-            self.validate_appointment_as_next(appointment)
-            appointment.save(update_fields=["appt_status", "appt_datetime", "comment"])
+        appointment.appt_status = NEW_APPT
+        appointment.appt_datetime = self.next_appt_datetime
+        appointment.comment = ""
+        self.validate_appointment_as_next(appointment)
+        appointment.save(update_fields=["appt_status", "appt_datetime", "comment"])
 
     @property
     def last_crf_obj(self):

edc_appointment/stubs.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Optional, Protocol, TypeVar, Union
+from typing import Any, Protocol, TypeVar
 from uuid import UUID
 
 from django.db import models
@@ -8,23 +8,23 @@ from edc_visit_schedule.schedule import Schedule
 
 
 class AppointmentModelStub(Protocol):
-    id: Union[UUID, models.UUIDField]
-    pk: Union[UUID, models.UUIDField]
-    subject_identifier: Union[str, models.CharField]
-    appt_datetime: Union[datetime, models.DateTimeField]
-    visit_code: Union[str, models.CharField]
-    visit_code_sequence: Union[int, models.IntegerField]
-    visit_schedule_name: Union[str, models.CharField]
-    schedule_name: Union[str, models.CharField]
-    facility_name: Union[str, models.CharField]
-    timepoint: Union[int, models.IntegerField]
+    id: UUID | models.UUIDField
+    pk: UUID | models.UUIDField
+    subject_identifier: str | models.CharField
+    appt_datetime: datetime | models.DateTimeField
+    visit_code: str | models.CharField
+    visit_code_sequence: int | models.IntegerField
+    visit_schedule_name: str | models.CharField
+    schedule_name: str | models.CharField
+    facility_name: str | models.CharField
+    timepoint: int | models.IntegerField
     timepoint_datetime: datetime
     schedule: Schedule
     _meta: Any
 
     objects: models.Manager
 
-    last_visit_code_sequence: Optional[int]
+    last_visit_code_sequence: int | None
     next: "AppointmentModelStub"
     previous: "AppointmentModelStub"
     get_next: "AppointmentModelStub"

edc_appointment/utils.py

@@ -4,7 +4,7 @@ import calendar
 import sys
 import warnings
 from datetime import datetime
-from typing import TYPE_CHECKING, Any, Type
+from typing import TYPE_CHECKING, Any
 
 from dateutil.relativedelta import relativedelta
 from django.apps import apps as django_apps
@@ -23,9 +23,8 @@ from django.db.models import Count, ProtectedError
 from django.urls import reverse
 from django.utils.translation import gettext as _
 
-from edc_constants.constants import CLINIC
+from edc_constants.constants import CLINIC, NOT_APPLICABLE, OK
 from edc_constants.constants import ERROR as ERROR_CODE
-from edc_constants.constants import NOT_APPLICABLE, OK
 from edc_dashboard.url_names import url_names
 from edc_form_validators import INVALID_ERROR
 from edc_metadata.constants import CRF, REQUIRED, REQUISITION
@@ -89,7 +88,7 @@ def get_appointment_model_name() -> str:
     return "edc_appointment.appointment"
 
 
-def get_appointment_model_cls() -> Type[Appointment]:
+def get_appointment_model_cls() -> type[Appointment]:
     return django_apps.get_model(get_appointment_model_name())
 
 
@@ -97,7 +96,7 @@ def get_appointment_type_model_name() -> str:
     return "edc_appointment.appointmenttype"
 
 
-def get_appointment_type_model_cls() -> Type[AppointmentType]:
+def get_appointment_type_model_cls() -> type[AppointmentType]:
     return django_apps.get_model(get_appointment_type_model_name())
 
 
@@ -369,7 +368,6 @@ def delete_appointment_in_sequence(appointment: Any, from_post_delete=None) -> N
             schedule_name=appointment.schedule_name,
             visit_code=appointment.visit_code,
         )
-    return None
 
 
 def update_appt_status(appointment: Appointment, save: bool | None = None):
@@ -383,14 +381,13 @@ def update_appt_status(appointment: Appointment, save: bool | None = None):
         pass
     elif not appointment.related_visit:
         appointment.appt_status = NEW_APPT
+    elif (
+        appointment.crf_metadata_required_exists
+        or appointment.requisition_metadata_required_exists
+    ):
+        appointment.appt_status = INCOMPLETE_APPT
     else:
-        if (
-            appointment.crf_metadata_required_exists
-            or appointment.requisition_metadata_required_exists
-        ):
-            appointment.appt_status = INCOMPLETE_APPT
-        else:
-            appointment.appt_status = COMPLETE_APPT
+        appointment.appt_status = COMPLETE_APPT
     if save:
         appointment.save_base(update_fields=["appt_status"])
         appointment.refresh_from_db()
@@ -578,7 +575,7 @@ def appt_datetime_in_next_window_adjusted_for_gap(
     in_window = False
     gap_days = get_window_gap_days(appointment)
     max_gap = get_max_window_gap_to_lower(appointment)
-    gap_days = max_gap if gap_days > max_gap else gap_days
+    gap_days = min(gap_days, max_gap)
     if gap_days > 0:
         next_lower_datetime = (
             appointment.next.timepoint_datetime
@@ -639,22 +636,21 @@ def get_appointment_by_datetime(
                     f"Date falls in a `window period gap` between {appointment.visit_code} "
                     f"and {appointment.next.visit_code}. Got {dt}."
                 )
-            elif (
+            if (
                 in_gap
                 and in_next_window_adjusted
                 and appointment.next.visit.add_window_gap_to_lower
             ):
                 appointment = appointment.next
                 break
-            elif (
+            if (
                 in_gap
                 and not in_next_window_adjusted
                 and appointment.next.visit.add_window_gap_to_lower
             ):
                 appointment = None
                 break
-            else:
-                appointment = appointment.next
+            appointment = appointment.next
         else:
             break
     return appointment
@@ -674,27 +670,26 @@ def reset_appointment(appointment: Appointment, **kwargs):
         raise AppointmentAlreadyStarted(
             f"Unable to reset. Appointment already started. Got {appointment}."
         )
-    else:
-        defaults = dict(
-            appt_status=appointment._meta.get_field("appt_status").default,
-            appt_timing=appointment._meta.get_field("appt_timing").default,
-            appt_type=None,
-            appt_type_other=None,
-            appt_datetime=appointment.timepoint_datetime,
-            comment="",
-        )
-        defaults.update(**kwargs)
-        for k, v in defaults.items():
+    defaults = dict(
+        appt_status=appointment._meta.get_field("appt_status").default,
+        appt_timing=appointment._meta.get_field("appt_timing").default,
+        appt_type=None,
+        appt_type_other=None,
+        appt_datetime=appointment.timepoint_datetime,
+        comment="",
+    )
+    defaults.update(**kwargs)
+    for k, v in defaults.items():
+        try:
+            related_model = get_model_from_relation(appointment._meta.get_field(k))
+        except NotRelationField:
+            setattr(appointment, k, v)
+        else:
             try:
-                related_model = get_model_from_relation(appointment._meta.get_field(k))
-            except NotRelationField:
-                setattr(appointment, k, v)
-            else:
-                try:
-                    setattr(appointment, k, related_model.objects.get(name=v))
-                except ObjectDoesNotExist:
-                    setattr(appointment, k, None)
-        appointment.save_base(update_fields=[*defaults.keys()])
+                setattr(appointment, k, related_model.objects.get(name=v))
+            except ObjectDoesNotExist:
+                setattr(appointment, k, None)
+    appointment.save_base(update_fields=[*defaults.keys()])
 
 
 def skip_appointment(appointment: Appointment, comment: str | None = None):
@@ -705,14 +700,13 @@ def skip_appointment(appointment: Appointment, comment: str | None = None):
         raise AppointmentAlreadyStarted(
             f"Unable to skip. Appointment already started. Got {appointment}."
         )
-    else:
-        reset_appointment(
-            appointment,
-            appt_status=SKIPPED_APPT,
-            appt_timing=NOT_APPLICABLE,
-            appt_type=NOT_APPLICABLE,
-            comment=comment,
-        )
+    reset_appointment(
+        appointment,
+        appt_status=SKIPPED_APPT,
+        appt_timing=NOT_APPLICABLE,
+        appt_type=NOT_APPLICABLE,
+        comment=comment,
+    )
 
 
 def get_unscheduled_appointment_url(appointment: Appointment = None) -> str:
@@ -820,7 +814,7 @@ def validate_date_is_on_clinic_day(
             raise raise_validation_error(
                 {"appt_date": "Cannot be equal to the report datetime"}, INVALID_ERROR
             )
-        elif appt_date <= report_date:
+        if appt_date <= report_date:
             raise raise_validation_error(
                 {"appt_date": "Cannot be before the report datetime"}, INVALID_ERROR
             )

edc_appointment/view_utils/appointment_button.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 from uuid import UUID
 
 from django.apps import apps as django_apps
@@ -24,7 +24,7 @@ __all__ = ["AppointmentButton"]
 class AppointmentButton(DashboardModelButton):
     model_obj: Appointment = None
     colors: tuple[str, str, str] = field(default=(3 * ("default",)))
-    model_cls: Type[Appointment] = field(default=None, init=False)
+    model_cls: type[Appointment] = field(default=None, init=False)
     appointment: Appointment = field(default=None, init=False)
 
     def __post_init__(self):
@@ -33,9 +33,7 @@ class AppointmentButton(DashboardModelButton):
     @property
     def disabled(self) -> str:
         disabled = "disabled"
-        if self.model_obj.appt_status == IN_PROGRESS_APPT and self.perms.change:
-            disabled = ""
-        elif (
+        if (self.model_obj.appt_status == IN_PROGRESS_APPT and self.perms.change) or (
             self.model_obj.appt_status != NEW_APPT
             and not self.perms.add
             and not self.perms.change

edc_auth/admin/role_admin.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
@@ -14,15 +12,15 @@ from ..models import Role
 class RoleAdmin(TemplatesModelAdminMixin, admin.ModelAdmin):
     fieldsets = ((None, ({"fields": ("display_name", "name", "display_index", "groups")})),)
 
-    list_display_links: Tuple[str, ...] = ("display_name", "group_list")
+    list_display_links: tuple[str, ...] = ("display_name", "group_list")
 
-    list_display: Tuple[str, ...] = ("display_name", "name", "group_list")
+    list_display: tuple[str, ...] = ("display_name", "name", "group_list")
 
-    filter_horizontal: Tuple[str, ...] = ("groups",)
+    filter_horizontal: tuple[str, ...] = ("groups",)
 
-    search_fields: Tuple[str, ...] = ("display_name", "name", "groups__name")
+    search_fields: tuple[str, ...] = ("display_name", "name", "groups__name")
 
-    ordering: Tuple[str, ...] = ("display_index", "display_name")
+    ordering: tuple[str, ...] = ("display_index", "display_name")
 
     list_filter = ("groups__name",)
 

edc_auth/auth_objects/default_roles.py

@@ -1,5 +1,3 @@
-from typing import Dict, List
-
 from ..constants import (
     ACCOUNT_MANAGER,
     ACCOUNT_MANAGER_ROLE,
@@ -20,7 +18,7 @@ from ..constants import (
 )
 
 # Format {ROLE_NAME: [GROUP_NAME, GROUP_NAME, ...]
-default_roles: Dict[str, List[str]] = {
+default_roles: dict[str, list[str]] = {
     ACCOUNT_MANAGER_ROLE: [ACCOUNT_MANAGER],
     AUDITOR_ROLE: [
         AUDITOR,

edc_auth/auth_updater/auth_updater.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import sys
-from typing import Callable
+from collections.abc import Callable
 
 from django.apps import apps as django_apps
 from django.conf import settings
@@ -89,9 +89,8 @@ class AuthUpdater:
             for func in pre_updates:
                 sys.stdout.write(f"   * {func.__name__}\n")
                 func(self)
-        else:
-            if self.verbose:
-                sys.stdout.write("   * nothing to do\n")
+        elif self.verbose:
+            sys.stdout.write("   * nothing to do\n")
         if self.verbose:
             sys.stdout.write("   Done.\n")
 
@@ -103,9 +102,8 @@ class AuthUpdater:
             for app_label, func in post_updates:
                 sys.stdout.write(f"   * {func.__name__}({app_label})\n")
                 func(self, app_label)
-        else:
-            if self.verbose:
-                sys.stdout.write("   * nothing to do\n")
+        elif self.verbose:
+            sys.stdout.write("   * nothing to do\n")
         if self.verbose:
             sys.stdout.write("   Done.\n")