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

edc_sites/models/__init__.py

@@ -1,3 +1,3 @@
-from ..managers import CurrentSiteManager  # noqa (leave for old migrations)
+from ..managers import CurrentSiteManager
 from .edc_permissions import EdcPermissions
 from .site_profile import SiteProfile

edc_sites/models/site_profile.py

@@ -9,13 +9,13 @@ from django.db import models
 class SiteProfile(models.Model):
     id = models.BigAutoField(primary_key=True)
 
-    country = models.CharField(max_length=250, null=True)
+    country = models.CharField(max_length=250, default="")
 
-    country_code = models.CharField(max_length=15, null=True)
+    country_code = models.CharField(max_length=15, default="")
 
-    languages = models.TextField(null=True)
+    languages = models.TextField(default="")
 
-    title = models.CharField(max_length=250, null=True)
+    title = models.CharField(max_length=250, default="")
 
     site = models.OneToOneField(Site, on_delete=models.PROTECT)
 

edc_sites/site.py

@@ -35,19 +35,19 @@ if TYPE_CHECKING:
 
 
 __all__ = [
-    "SiteDoesNotExist",
     "AlreadyRegistered",
-    "AlreadyRegisteredName",
     "AlreadyRegisteredDomain",
+    "AlreadyRegisteredName",
+    "SiteDoesNotExist",
     "SiteNotRegistered",
     "SitesCheckError",
     "SitesError",
-    "get_register_default_site",
+    "get_autodiscover_sites",
     "get_default_country",
     "get_default_country_code",
     "get_default_domain",
     "get_insert_uat_subdomain",
-    "get_autodiscover_sites",
+    "get_register_default_site",
     "sites",
 ]
 
@@ -160,13 +160,13 @@ class Sites:
                     single_site = dataclasses.replace(single_site, domain=domain)
 
                 if single_site.site_id in self._registry:
-                    raise AlreadyRegistered(f"Site already registered. Got `{single_site}`.")
-                elif single_site.name in [s.name for s in self._registry.values()]:
-                    raise AlreadyRegisteredName(
+                    raise AlreadyRegistered(f"Site already registered. Got `{single_site}`.")  # noqa: TRY003
+                if single_site.name in [s.name for s in self._registry.values()]:
+                    raise AlreadyRegisteredName(  # noqa: TRY003
                         f"Site with this name is already registered. Got `{single_site}`."
                     )
-                elif single_site.domain in [s.domain for s in self._registry.values()]:
-                    raise AlreadyRegisteredDomain(
+                if single_site.domain in [s.domain for s in self._registry.values()]:
+                    raise AlreadyRegisteredDomain(  # noqa: TRY003
                         f"Site with this domain is already registered. Got `{single_site}`."
                     )
                 self._registry.update({single_site.site_id: single_site})
@@ -187,8 +187,8 @@ class Sites:
                 msg = "In fact, no sites have been registered!"
             else:
                 msg = f"Expected one of {[s.site_id for s in self.all(aslist=True)]}."
-            raise SiteNotRegistered(
-                f"Site not registered. {msg} See {repr(self)}. Got `{site_id}`."
+            raise SiteNotRegistered(  # noqa: TRY003
+                f"Site not registered. {msg} See {self!r}. Got `{site_id}`."
             )
         return self._registry.get(site_id)
 
@@ -196,7 +196,7 @@ class Sites:
         for single_site in self._registry.values():
             if getattr(single_site, attrname) == value:
                 return single_site
-        raise SiteDoesNotExist(f"No site exists with `{attrname}`==`{value}`.")
+        raise SiteDoesNotExist(f"No site exists with `{attrname}`==`{value}`.")  # noqa: TRY003
 
     def all(self, aslist: bool | None = None) -> dict[int, SingleSite] | list[SingleSite]:
         if aslist:
@@ -237,9 +237,10 @@ class Sites:
         if request:
             user = request.user
             site_id = request.site.id
-        return [site_id] + self.get_view_only_site_ids_for_user(
-            request=request, user=user, site_id=site_id
-        )
+        return [
+            site_id,
+            *self.get_view_only_site_ids_for_user(request=request, user=user, site_id=site_id),
+        ]
 
     @staticmethod
     def get_view_only_site_ids_for_user(
@@ -276,14 +277,6 @@ class Sites:
                     add_to_messages_once(
                         request, messages.WARNING, get_message_text(messages.WARNING)
                     )
-        # else:
-        #     if self.has_viewallsites_permission(request):
-        #         site_ids = [
-        #             s.id
-        #             for s in request.user.userprofile.sites.all()
-        #             if s.id != request.site.id
-        #         ]
-
         return site_ids
 
     def user_may_view_other_sites(
@@ -291,25 +284,24 @@ class Sites:
         request: WSGIRequest = None,
         user: User = None,
         site_id: int = None,
-    ) -> bool:
-        if self.get_view_only_site_ids_for_user(
+    ) -> list[int]:
+        return self.get_view_only_site_ids_for_user(
             request=request,
             user=user,
             site_id=site_id,
-        ):
-            return True
-        return False
+        )
 
     @staticmethod
     def site_in_profile_or_raise(user: User, site_id: int) -> None:
         """Raises if user does not have site in their UserProfile."""
         try:
-            user.userprofile.sites.get(id=site_id).id
-        except ObjectDoesNotExist:
-            raise InvalidSiteForUser(
+            user.userprofile.sites.get(id=site_id).id  # noqa: B018
+        except ObjectDoesNotExist as e:
+            errmsg = (
                 "User is not configured to access this site. See also UserProfile. "
                 f"Got {site_id}."
             )
+            raise InvalidSiteForUser(errmsg) from e
 
     def get_language_choices_tuple(
         self, site: Site | None = None, site_id: int | None = None, other=None
@@ -363,7 +355,7 @@ class Sites:
                 except ImportError as e:
                     sites._registry = before_import_registry
                     if module_has_submodule(mod, module_name):
-                        raise SitesError(str(e))
+                        raise SitesError(str(e)) from e
             except ImportError:
                 pass
 

edc_sites/system_checks.py

@@ -79,7 +79,7 @@ def match_country_and_country_code_or_raise(single_site: SingleSite, site_obj):
 
 def match_languages_or_raise(single_site: SingleSite, site_obj):
     value1 = single_site.languages
-    value2 = json.loads(getattr(site_obj.siteprofile, "languages"))
+    value2 = json.loads(site_obj.siteprofile.languages)
     if value1 != value2:
         raise SitesCheckError(
             f"Site table is out of sync. Checking {site_obj.id} "

edc_sites/utils/get_message_text.py

@@ -7,7 +7,7 @@ def get_message_text(level: int) -> str:
         return _(
             "You have permissions to view forms and data from sites other than the current. "
         )
-    elif level == messages.ERROR:
+    if level == messages.ERROR:
         return _(
             "Showing data from the current site only. Although you have permissions to view "
             "data from multiple sites you also have permissions to add, change or delete "

edc_sites/utils/valid_site_for_subject_or_raise.py

@@ -46,10 +46,9 @@ def valid_site_for_subject_or_raise(
                     "Site not defined for registered subject! "
                     f"Subject identifier=`{subject_identifier}`. "
                 )
-            else:
-                raise InvalidSiteForSubjectError(
-                    f"Invalid site for subject. Subject identifier=`{subject_identifier}`. "
-                    f"Expected `{registered_subject.site.name}`. "
-                    f"Got site_id=`{site_obj.id}`"
-                )
+            raise InvalidSiteForSubjectError(
+                f"Invalid site for subject. Subject identifier=`{subject_identifier}`. "
+                f"Expected `{registered_subject.site.name}`. "
+                f"Got site_id=`{site_obj.id}`"
+            )
     return site_obj

edc_subject_dashboard/requisition_report.py

@@ -122,8 +122,8 @@ class RequisitionReport(Report):
             [Paragraph("TEL/MOBILE/FAX", self.styles["line_label"]), ""],
             [
                 Paragraph(
-                    f'T:{self.shipper.telephone or "?"} M:{self.shipper.mobile or "?"} '
-                    f'F:{self.shipper.fax or "?"}',
+                    f"T:{self.shipper.telephone or '?'} M:{self.shipper.mobile or '?'} "
+                    f"F:{self.shipper.fax or '?'}",
                     self.styles["line_data_large"],
                 ),
                 "",
@@ -257,7 +257,7 @@ class RequisitionReport(Report):
         if not self._requisitions:
             for k, v in self.appointment.related_visit_model_cls().__dict__.items():
                 try:
-                    model_cls = getattr(getattr(v, "rel"), "related_model")
+                    model_cls = v.rel.related_model
                 except AttributeError:
                     pass
                 else:
@@ -350,8 +350,7 @@ class RequisitionReport(Report):
                         barcode,
                         Paragraph(str(index + 1), self.styles["row_data"]),
                         Paragraph(
-                            f"{requisition.human_readable_identifier} "
-                            f"({count}/{item_count})",
+                            f"{requisition.human_readable_identifier} ({count}/{item_count})",
                             self.styles["row_data"],
                         ),
                         Paragraph(

edc_subject_dashboard/requisition_verifier.py

@@ -35,7 +35,9 @@ class RequisitionVerifier:
         return f"{self.requisition_identifier} {self.verified}"
 
     def __repr__(self):
-        return f"<{self.__class__.__name__}(" "{self.requisition_identifier}) {self.verified}>"
+        return (
+            f"<{self.__class__.__name__}({{self.requisition_identifier}}) {{self.verified}}>"
+        )
 
     @property
     def requisition(self):
@@ -60,7 +62,7 @@ class RequisitionVerifier:
         visit_model_cls = self.appointment.related_visit.__class__
         for attr in dir(visit_model_cls):
             try:
-                obj = getattr(getattr(visit_model_cls, attr), "rel")
+                obj = getattr(visit_model_cls, attr).rel
             except AttributeError:
                 pass
             else:

edc_subject_dashboard/templatetags/edc_subject_dashboard_extras.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from collections import namedtuple
-from typing import TYPE_CHECKING, Type, TypeVar
+from typing import TYPE_CHECKING, TypeVar
 
 from dateutil.relativedelta import relativedelta
 from django import template
@@ -56,16 +56,16 @@ if TYPE_CHECKING:
 
 __all__ = [
     "appointment_in_progress",
-    "render_appointment_status_icon",
     "print_requisition_popover",
-    "render_prn_button",
     "render_appointment_button",
+    "render_appointment_status_icon",
     "render_crf_button_group",
-    "render_gotoforms_button",
-    "requisition_panel_actions",
     "render_crf_totals",
+    "render_gotoforms_button",
+    "render_prn_button",
     "render_subject_consent_dashboard_button",
     "render_unscheduled_appointment_button",
+    "requisition_panel_actions",
 ]
 
 register = template.Library()
@@ -302,7 +302,7 @@ def render_related_visit_button(context, appointment: Appointment = None):
     # from model_wrapper
     appointment = getattr(appointment, "object", appointment)
     related_visit: VisitModel = appointment.related_visit
-    related_visit_model_cls: Type[VisitModel] = appointment.related_visit_model_cls()
+    related_visit_model_cls: type[VisitModel] = appointment.related_visit_model_cls()
     btn = RelatedVisitButton(
         model_obj=related_visit,
         model_cls=related_visit_model_cls,
@@ -322,7 +322,7 @@ def render_gotoforms_button(context, appointment: Appointment = None):
     # from model_wrapper
     appointment: Appointment = getattr(appointment, "object", appointment)
     related_visit: VisitModel = appointment.related_visit
-    related_visit_model_cls: Type[VisitModel] = appointment.related_visit_model_cls()
+    related_visit_model_cls: type[VisitModel] = appointment.related_visit_model_cls()
     btn = GotToFormsButton(
         model_obj=related_visit,
         model_cls=related_visit_model_cls,
@@ -424,8 +424,7 @@ def render_unscheduled_appointment_button(
     ):
         show_button = True
         anchor_id = (
-            f"unscheduled_appt_btn_{appointment.visit_code}_"
-            f"{appointment.visit_code_sequence}"
+            f"unscheduled_appt_btn_{appointment.visit_code}_{appointment.visit_code_sequence}"
         )
         if view_appointment and appointment.site.id == context["request"].site.id:
             url = get_unscheduled_appointment_url(appointment)
@@ -482,9 +481,9 @@ def render_refresh_appointments_button(
     visit_schedule_name: str = None,
     schedule_name: str = None,
 ) -> dict:
-    if context["request"].user.userprofile.is_multisite_viewer:
-        url = None
-    elif context["request"].user.userprofile.roles.filter(name=AUDITOR_ROLE):
+    if context["request"].user.userprofile.is_multisite_viewer or context[
+        "request"
+    ].user.userprofile.roles.filter(name=AUDITOR_ROLE):
         url = None
     else:
         url = reverse(
@@ -508,11 +507,11 @@ def render_refresh_data_collection_schedule_button(
     visit_schedule_name: str = None,
     schedule_name: str = None,
 ) -> dict:
-    if context["request"].user.userprofile.is_multisite_viewer:
-        url = None
-    elif context["request"].user.userprofile.roles.filter(name=AUDITOR_ROLE):
-        url = None
-    elif not related_visit_id:
+    if (
+        context["request"].user.userprofile.is_multisite_viewer
+        or context["request"].user.userprofile.roles.filter(name=AUDITOR_ROLE)
+        or not related_visit_id
+    ):
         url = None
     else:
         url = reverse(

edc_subject_dashboard/view_utils/__init__.py

@@ -13,6 +13,6 @@ __all__ = [
     "RequisitionButton",
     "SubjectConsentDashboardButton",
     "SubjectConsentListboardButton",
-    "TimepointStatusButton",
     "SubjectScreeningButton",
+    "TimepointStatusButton",
 ]

edc_subject_dashboard/view_utils/crf_button.py

@@ -19,9 +19,7 @@ class CrfButton(DashboardModelButton):
     @property
     def disabled(self) -> str:
         disabled = "disabled"
-        if not self.model_obj and self.perms.add:
-            disabled = ""
-        elif self.perms.change:
+        if (not self.model_obj and self.perms.add) or self.perms.change:
             disabled = ""
         elif self.perms.view:
             if self.model_obj:

edc_subject_dashboard/view_utils/subject_consent_dashboard_button.py

@@ -5,7 +5,7 @@ from uuid import UUID
 
 __all__ = ["SubjectConsentDashboardButton"]
 
-from typing import TYPE_CHECKING, Type, TypeVar
+from typing import TYPE_CHECKING, TypeVar
 
 from edc_view_utils import ModelButton
 
@@ -21,7 +21,7 @@ class SubjectConsentDashboardButton(ModelButton):
     """For the subject dashboard"""
 
     model_obj: ConsentModel = None
-    model_cls: Type[ConsentModel] = None
+    model_cls: type[ConsentModel] = None
     appointment: Appointment = None
 
     def __post_init__(self):

edc_subject_dashboard/view_utils/subject_consent_listboard_button.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import re
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Type, TypeVar
+from typing import TYPE_CHECKING, TypeVar
 from uuid import UUID
 
 from edc_consent import site_consents
@@ -37,7 +37,7 @@ class SubjectConsentListboardButton(ModelButton):
 
     screening_obj: ScreeningModel = field(default=None)
     model_obj: ConsentModel = field(default=None)
-    model_cls: Type[ConsentModel] = field(default=None)
+    model_cls: type[ConsentModel] = field(default=None)
     consent_version: str = field(default=None, init=False)
 
     def __post_init__(self):

edc_subject_dashboard/view_utils/timepoint_status_button.py

@@ -88,9 +88,6 @@ class TimepointStatusButton(AppointmentButton):
     @property
     def disabled(self) -> str:
         disabled = "disabled"
-        if not self.model_obj and self.perms.add:
+        if (not self.model_obj and self.perms.add) or self.perms.change or self.perms.view:
             disabled = ""
-        else:
-            if self.perms.change or self.perms.view:
-                disabled = ""
         return disabled

edc_subject_dashboard/views/requisition_print_actions_view.py

@@ -151,7 +151,7 @@ class RequisitionPrintActionsView(BaseRequisitionView):
         if not self._requisition_model_cls:
             for v in self.appointment.visit_model_cls().__dict__.values():
                 try:
-                    model_cls = getattr(getattr(v, "rel"), "related_model")
+                    model_cls = v.rel.related_model
                 except AttributeError:
                     pass
                 else:
@@ -167,7 +167,7 @@ class RequisitionPrintActionsView(BaseRequisitionView):
         verified_requisitions = []
         for k, v in self.appointment.visit_model_cls().__dict__.items():
             try:
-                model_cls = getattr(getattr(v, "rel"), "related_model")
+                model_cls = v.rel.related_model
             except AttributeError:
                 pass
             else:

edc_subject_dashboard/views/subject_dashboard_view.py

@@ -50,7 +50,7 @@ class SubjectDashboardView(
 
     def __init__(self, **kwargs):
         if not self.navbar_name:
-            raise ImproperlyConfigured(f"'navbar_name' cannot be None. See {repr(self)}.")
+            raise ImproperlyConfigured(f"'navbar_name' cannot be None. See {self!r}.")
         super().__init__(**kwargs)
 
     @property

edc_timepoint/model_mixins.py

@@ -142,9 +142,9 @@ class TimepointModelMixin(models.Model):
         """Formats and returns the status for the change_list."""
         if self.timepoint_status == OPEN_TIMEPOINT:
             return '<span style="color:green;">Open</span>'
-        elif self.timepoint_status == CLOSED_TIMEPOINT:
+        if self.timepoint_status == CLOSED_TIMEPOINT:
             return '<span style="color:red;">Closed</span>'
-        elif self.timepoint_status == FEEDBACK:
+        if self.timepoint_status == FEEDBACK:
             return '<span style="color:orange;">Feedback</span>'
 
     # timepoint.allow_tags = True

edc_transfer/action_items.py

@@ -12,7 +12,7 @@ class SubjectTransferAction(ActionWithNotification):
     name = SUBJECT_TRANSFER_ACTION
     display_name = "Submit Subject Transfer"
     notification_display_name = " Subject Transfer"
-    parent_action_names = []
+    parent_action_names = ()
     show_link_to_changelist = True
     show_link_to_add = True
     priority = HIGH_PRIORITY

edc_transfer/model_mixins.py

@@ -69,13 +69,14 @@ class SubjectTransferModelMixin(
         return f"{self.subject_identifier} on {transfer_date}."
 
     def natural_key(self):
-        return (self.subject_identifier,)  # noqa
+        return (self.subject_identifier,)
 
     class Meta(SiteModelMixin.Meta, ActionModelMixin.Meta):
         abstract = True
         verbose_name = "Subject Transfer"
         verbose_name_plural = "Subject Transfers"
-        indexes = ActionModelMixin.Meta.indexes + [
+        indexes = (
+            *ActionModelMixin.Meta.indexes,
             models.Index(
                 fields=[
                     "subject_identifier",
@@ -84,4 +85,4 @@ class SubjectTransferModelMixin(
                     "site",
                 ]
             ),
-        ]
+        )

edc_transfer/modeladmin_mixins.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
 
@@ -38,7 +36,7 @@ class SubjectTransferModelAdminMixin:
         "may_contact": admin.VERTICAL,
     }
 
-    def get_list_display(self, request) -> Tuple[str, ...]:
+    def get_list_display(self, request) -> tuple[str, ...]:
         list_display = super().get_list_display(request)
         custom_fields = (
             "subject_identifier",
@@ -50,8 +48,7 @@ class SubjectTransferModelAdminMixin:
         )
         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 = (
             "transfer_date",
@@ -61,7 +58,7 @@ class SubjectTransferModelAdminMixin:
         )
         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)
         custom_fields = ("subject_identifier",)
         return tuple(set(custom_fields + search_fields))

edc_unblinding/action_items.py

@@ -12,7 +12,7 @@ class UnblindingRequestAction(ActionWithNotification):
     name = UNBLINDING_REQUEST_ACTION
     display_name = "Unblinding request"
     notification_display_name = " Unblinding request"
-    parent_action_names = []
+    parent_action_names = ()
     show_link_to_changelist = True
     show_link_to_add = True
     priority = HIGH_PRIORITY
@@ -34,7 +34,7 @@ class UnblindingReviewAction(ActionWithNotification):
     name = UNBLINDING_REVIEW_ACTION
     display_name = "Unblinding review pending"
     notification_display_name = " Unblinding review needed"
-    parent_action_names = [UNBLINDING_REQUEST_ACTION]
+    parent_action_names = (UNBLINDING_REQUEST_ACTION,)
     show_link_to_changelist = True
     priority = HIGH_PRIORITY
     color_style = "info"

edc_unblinding/models/unblinding_request.py

@@ -66,6 +66,6 @@ class UnblindingRequest(
     class Meta(BaseUuidModel.Meta, NonUniqueSubjectIdentifierFieldMixin.Meta):
         verbose_name = "Unblinding Request"
         verbose_name_plural = "Unblinding Requests"
-        indexes = [
-            models.Index(fields=["subject_identifier", "action_identifier", "site", "id"])
-        ]
+        indexes = (
+            models.Index(fields=["subject_identifier", "action_identifier", "site", "id"]),
+        )

edc_unblinding/models/unblinding_review.py

@@ -48,6 +48,6 @@ class UnblindingReview(
     class Meta(BaseUuidModel.Meta, NonUniqueSubjectIdentifierFieldMixin.Meta):
         verbose_name = "Unblinding Review"
         verbose_name_plural = "Unblinding Reviews"
-        indexes = [
-            models.Index(fields=["subject_identifier", "action_identifier", "site", "id"])
-        ]
+        indexes = (
+            models.Index(fields=["subject_identifier", "action_identifier", "site", "id"]),
+        )

edc_utils/__init__.py

@@ -1,7 +1,7 @@
 from .age import AgeValueError, age, formatted_age, get_age_in_days, get_dob
 from .context_processors_check import edc_context_processors_check
 from .dashboard_middleware_check import edc_middleware_check
-from .date import ceil_secs, floor_secs, get_utcnow, get_utcnow_as_date, to_utc
+from .date import ceil_secs, floor_secs, get_utcnow, get_utcnow_as_date, to_local, to_utc
 from .disable_signals import DisableSignals
 from .get_datetime_from_env import get_datetime_from_env
 from .get_static_file import get_static_file
@@ -25,7 +25,6 @@ __all__ = [
     "DisableSignals",
     "age",
     "ceil_secs",
-    "message_in_queue",
     "convert_from_camel",
     "convert_php_dateformat",
     "edc_context_processors_check",
@@ -43,13 +42,15 @@ __all__ = [
     "get_utcnow",
     "get_utcnow_as_date",
     "get_uuid",
+    "message_in_queue",
     "paths_for_urlpatterns",
-    "round_up",
-    "round_half_up",
     "round_half_away_from_zero",
+    "round_half_up",
+    "round_up",
     "safe_allowed_chars",
     "show_url_names",
     "show_urls",
-    "truncate_string",
+    "to_local",
     "to_utc",
+    "truncate_string",
 ]

edc_utils/age.py

@@ -52,7 +52,7 @@ def age(
     rdelta = relativedelta(reference_dt_utc, born_utc)
     if born_utc > reference_dt_utc:
         raise AgeValueError(
-            f"Reference date {reference_dt} {str(reference_dt.tzinfo)} "
+            f"Reference date {reference_dt} {reference_dt.tzinfo!s} "
             f"precedes DOB {born} {timezone}. Got {rdelta}"
         )
     return rdelta

edc_utils/celery.py

@@ -9,14 +9,9 @@ celery_enabled = getattr(settings, "CELERY_ENABLED", False)
 def run_task_sync_or_async(task, *args, **kwargs) -> AsyncResult:
     """Run a task with celery if running"""
 
-    if not celery_enabled:
+    if not celery_enabled or not celery_is_active() or current_app.conf.task_always_eager:
         return task(*args, **kwargs)
-    elif not celery_is_active():
-        return task(*args, **kwargs)
-    elif current_app.conf.task_always_eager:
-        return task(*args, **kwargs)
-    else:
-        return task.delay(*args, **kwargs)
+    return task.delay(*args, **kwargs)
 
 
 def celery_is_active() -> dict:
@@ -45,4 +40,4 @@ def get_task_result(obj) -> AsyncResult | None:
     return result
 
 
-__all__ = ["run_task_sync_or_async", "get_task_result", "celery_is_active"]
+__all__ = ["celery_is_active", "get_task_result", "run_task_sync_or_async"]

edc_utils/get_static_file.py

@@ -9,7 +9,7 @@ def get_static_file(app_label: str, filename: str) -> str:
     path = os.path.join(settings.STATIC_ROOT or "", app_label, filename)
     if os.path.isfile(path):
         try:
-            with open(path, "r"):
+            with open(path):
                 pass
         except FileNotFoundError:
             path = os.path.join(f"https://{settings.STATIC_URL}", app_label, filename)