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

edc_form_validators/many_to_many_field_validator.py

@@ -1,5 +1,3 @@
-from typing import Optional, Union
-
 from django.forms import ValidationError
 
 from edc_constants.constants import NOT_APPLICABLE, OTHER
@@ -28,7 +26,7 @@ class ManyToManyFieldValidator(BaseFormValidator):
         }
 
     def m2m_applicable_if_true(self, cond: bool, m2m_field: str = None) -> bool:
-        code: Optional[str] = None
+        code: str | None = None
         message: dict = {}
         qs = self.cleaned_data.get(m2m_field)
         if cond:
@@ -37,12 +35,11 @@ class ManyToManyFieldValidator(BaseFormValidator):
                 if NOT_APPLICABLE in selected:
                     message = {m2m_field: "This field is applicable"}
                     code = APPLICABLE_ERROR
-        else:
-            if qs and qs.count() > 0:
-                selected = self.get_m2m_selected(m2m_field)
-                if NOT_APPLICABLE not in selected:
-                    message = {m2m_field: "This field is not applicable"}
-                    code = NOT_APPLICABLE_ERROR
+        elif qs and qs.count() > 0:
+            selected = self.get_m2m_selected(m2m_field)
+            if NOT_APPLICABLE not in selected:
+                message = {m2m_field: "This field is not applicable"}
+                code = NOT_APPLICABLE_ERROR
         if message:
             self._errors.update(message)
             self._error_codes.append(code)
@@ -51,7 +48,7 @@ class ManyToManyFieldValidator(BaseFormValidator):
 
     def m2m_applicable_if(
         self,
-        *responses: Union[str, int, bool],
+        *responses: str | int | bool,
         field: str = None,
         m2m_field: str = None,
     ) -> bool:
@@ -59,7 +56,7 @@ class ManyToManyFieldValidator(BaseFormValidator):
 
         m2m_field is applicable if field is in responses.
         """
-        code: Optional[str] = None
+        code: str | None = None
         message: dict = {}
         if self.cleaned_data.get(field):
             qs = self.cleaned_data.get(m2m_field)
@@ -70,13 +67,12 @@ class ManyToManyFieldValidator(BaseFormValidator):
                     if NOT_APPLICABLE not in selected:
                         message = {m2m_field: "This field is not applicable"}
                         code = NOT_APPLICABLE_ERROR
-            else:
-                # m2m should != NOT_APPLICABLE
-                if qs and qs.count() > 0:
-                    selected = self.get_m2m_selected(m2m_field)
-                    if NOT_APPLICABLE in selected:
-                        message = {m2m_field: "This field is applicable"}
-                        code = APPLICABLE_ERROR
+            # m2m should != NOT_APPLICABLE
+            elif qs and qs.count() > 0:
+                selected = self.get_m2m_selected(m2m_field)
+                if NOT_APPLICABLE in selected:
+                    message = {m2m_field: "This field is applicable"}
+                    code = APPLICABLE_ERROR
         if message:
             self._errors.update(message)
             self._error_codes.append(code)
@@ -88,7 +84,7 @@ class ManyToManyFieldValidator(BaseFormValidator):
 
         m2m_field is required.
         """
-        code: Optional[str] = None
+        code: str | None = None
         message: dict = {}
         if not self.cleaned_data.get(m2m_field):
             message = {m2m_field: "This field is required"}
@@ -104,7 +100,7 @@ class ManyToManyFieldValidator(BaseFormValidator):
 
         m2m_field is not required.
         """
-        code: Optional[str] = None
+        code: str | None = None
         message: dict = {}
         if self.cleaned_data.get(m2m_field):
             message = {m2m_field: "This field is not required"}
@@ -116,18 +112,17 @@ class ManyToManyFieldValidator(BaseFormValidator):
         return False
 
     def m2m_required_if(
-        self, response: Union[str, int, bool], field: str = None, m2m_field: str = None
+        self, response: str | int | bool, field: str = None, m2m_field: str = None
     ) -> bool:
         """Raises an exception or returns False.
 
         m2m_field is required if field  == response
         """
-        code: Optional[str] = None
+        code: str | None = None
         message: dict = {}
-        if self.cleaned_data.get(field) == response and not self.cleaned_data.get(m2m_field):
-            message = {m2m_field: "This field is required"}
-            code = REQUIRED_ERROR
-        elif (
+        if (
+            self.cleaned_data.get(field) == response and not self.cleaned_data.get(m2m_field)
+        ) or (
             self.cleaned_data.get(field) == response
             and self.cleaned_data.get(m2m_field).count() == 0
         ):
@@ -169,10 +164,10 @@ class ManyToManyFieldValidator(BaseFormValidator):
 
     def required_if_m2m(
         self,
-        *responses: Union[str, int, bool],
+        *responses: str | int | bool,
         field: str = None,
-        field_required: Optional[str] = None,
-        field_other_evaluate_as_int: Optional[bool] = None,
+        field_required: str | None = None,
+        field_other_evaluate_as_int: bool | None = None,
     ) -> bool:
         """Same as required_if() but where field is an m2m field."""
         return self.m2m_other_specify(
@@ -184,10 +179,10 @@ class ManyToManyFieldValidator(BaseFormValidator):
 
     def m2m_other_specify(
         self,
-        *responses: Union[str, int, bool],
+        *responses: str | int | bool,
         m2m_field: str = None,
-        field_other: Optional[str] = None,
-        field_other_evaluate_as_int: Optional[bool] = None,
+        field_other: str | None = None,
+        field_other_evaluate_as_int: bool | None = None,
     ) -> bool:
         """Raises an exception or returns False.
 
@@ -213,7 +208,7 @@ class ManyToManyFieldValidator(BaseFormValidator):
                 self._errors.update(message)
                 self._error_codes.append(REQUIRED_ERROR)
                 raise ValidationError(message, code=REQUIRED_ERROR)
-            elif not found and field_other_has_value:
+            if not found and field_other_has_value:
                 message = {field_other: "This field is not required."}
                 self._errors.update(message)
                 self._error_codes.append(NOT_REQUIRED_ERROR)
@@ -227,9 +222,9 @@ class ManyToManyFieldValidator(BaseFormValidator):
 
     def m2m_other_not_specify(
         self,
-        *responses: Union[str, int, bool],
+        *responses: str | int | bool,
         m2m_field: str = None,
-        field_other: Optional[str] = None,
+        field_other: str | None = None,
     ) -> bool:
         """Raises an exception or returns False.
 
@@ -249,7 +244,7 @@ class ManyToManyFieldValidator(BaseFormValidator):
                 self._errors.update(message)
                 self._error_codes.append(NOT_REQUIRED_ERROR)
                 raise ValidationError(message, code=NOT_REQUIRED_ERROR)
-            elif not found and not self.cleaned_data.get(field_other):
+            if not found and not self.cleaned_data.get(field_other):
                 message = {field_other: "This field is required."}
                 self._errors.update(message)
                 self._error_codes.append(REQUIRED_ERROR)
@@ -263,9 +258,9 @@ class ManyToManyFieldValidator(BaseFormValidator):
 
     def m2m_other_specify_applicable(
         self,
-        *responses: Union[str, int, bool],
+        *responses: str | int | bool,
         m2m_field: str = None,
-        field_other: Optional[str] = None,
+        field_other: str | None = None,
     ) -> bool:
         """Raises an exception or returns False.
 
@@ -285,7 +280,7 @@ class ManyToManyFieldValidator(BaseFormValidator):
                 self._errors.update(message)
                 self._error_codes.append(APPLICABLE_ERROR)
                 raise ValidationError(message, code=APPLICABLE_ERROR)
-            elif not found and self.cleaned_data.get(field_other) != NOT_APPLICABLE:
+            if not found and self.cleaned_data.get(field_other) != NOT_APPLICABLE:
                 message = {field_other: "This field is not applicable."}
                 self._errors.update(message)
                 self._error_codes.append(NOT_APPLICABLE_ERROR)
@@ -299,7 +294,7 @@ class ManyToManyFieldValidator(BaseFormValidator):
 
     def m2m_selection_expected(
         self,
-        response: Union[str, int, bool],
+        response: str | int | bool,
         m2m_field: str = None,
         error_msg: str = None,
     ) -> bool:
@@ -329,9 +324,9 @@ class ManyToManyFieldValidator(BaseFormValidator):
 
     def m2m_selections_not_expected(
         self,
-        *responses: Union[str, int, bool],
+        *responses: str | int | bool,
         m2m_field: str = None,
-        error_msg: Optional[str] = None,
+        error_msg: str | None = None,
     ) -> bool:
         """Raises an exception or returns False.
 
@@ -354,7 +349,7 @@ class ManyToManyFieldValidator(BaseFormValidator):
                 )
                 message = {
                     m2m_field: error_msg
-                    or f"Invalid selection. " f"Cannot be any of: {display_names}."
+                    or f"Invalid selection. Cannot be any of: {display_names}."
                 }
                 self._errors.update(message)
                 self._error_codes.append(M2M_INVALID_SELECTION)

edc_form_validators/other_specify_field_validator.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from django.forms import ValidationError
 
@@ -15,12 +15,12 @@ class OtherSpecifyFieldValidator(BaseFormValidator):
     def validate_other_specify(
         self,
         field: str,
-        other_specify_field: Optional[str] = None,
-        required_msg: Optional[str] = None,
-        not_required_msg: Optional[str] = None,
-        other_stored_value: Optional[Any] = None,
-        ref: Optional[str] = None,
-        fk_stored_field_name: Optional[str] = None,
+        other_specify_field: str | None = None,
+        required_msg: str | None = None,
+        not_required_msg: str | None = None,
+        other_stored_value: Any | None = None,
+        ref: str | None = None,
+        fk_stored_field_name: str | None = None,
     ) -> bool:
         """Returns False or raises a ValidationError.
 
@@ -51,19 +51,11 @@ class OtherSpecifyFieldValidator(BaseFormValidator):
             self._errors.update(message)
             self._error_codes.append(REQUIRED_ERROR)
             raise ValidationError(message, code=REQUIRED_ERROR)
-        elif (
+        if (
             field_value is not None
             and field_value != other
             and cleaned_data.get(other_specify_field)
-        ):
-            ref = "" if not ref else f" ref: {ref}"
-            message = {
-                other_specify_field: not_required_msg or f"This field is not required.{ref}"
-            }
-            self._errors.update(message)
-            self._error_codes.append(NOT_REQUIRED_ERROR)
-            raise ValidationError(message, code=NOT_REQUIRED_ERROR)
-        elif field_value is None and cleaned_data.get(other_specify_field):
+        ) or (field_value is None and cleaned_data.get(other_specify_field)):
             ref = "" if not ref else f" ref: {ref}"
             message = {
                 other_specify_field: not_required_msg or f"This field is not required.{ref}"

edc_form_validators/required_field_validator.py

@@ -1,5 +1,4 @@
 from copy import copy
-from typing import Optional, Union
 
 from django.db.models import QuerySet
 from django.utils.translation import gettext_lazy as _
@@ -20,7 +19,7 @@ class RequiredFieldValidatorError(Exception):
 
 class RequiredFieldValidator(BaseFormValidator):
     def raise_required(
-        self, field: str, msg: Optional[str] = None, inline_set: Optional[str] = None
+        self, field: str, msg: str | None = None, inline_set: str | None = None
     ) -> None:
         if inline_set:
             default_errmsg = _("Based on your responses, inline information is required.")
@@ -29,10 +28,9 @@ class RequiredFieldValidator(BaseFormValidator):
             errmsg = _("This field is required")
             message = {field: f"{errmsg}. {msg or ''}".strip()}
         self.raise_validation_error(message, REQUIRED_ERROR)
-        return None
 
     def raise_not_required(
-        self, field: str, msg: Optional[str] = None, inline_set: Optional[str] = None
+        self, field: str, msg: str | None = None, inline_set: str | None = None
     ) -> None:
         if inline_set:
             default_errmsg = _("Based on your responses, inline information is not required.")
@@ -41,20 +39,19 @@ class RequiredFieldValidator(BaseFormValidator):
             errmsg = _("This field is not required")
             message = {field: f"{errmsg}. {msg or ''}".strip()}
         self.raise_validation_error(message, NOT_REQUIRED_ERROR)
-        return None
 
     def required_if(
         self,
-        *responses: Union[str, int, bool],
+        *responses: str | int | bool,
         field: str = None,
         field_required: str = None,
-        required_msg: Optional[str] = None,
-        not_required_msg: Optional[str] = None,
-        optional_if_dwta: Optional[bool] = None,
-        optional_if_na: Optional[bool] = None,
-        inverse: Optional[bool] = None,
-        is_instance_field: Optional[bool] = None,
-        field_required_evaluate_as_int: Optional[bool] = None,
+        required_msg: str | None = None,
+        not_required_msg: str | None = None,
+        optional_if_dwta: bool | None = None,
+        optional_if_na: bool | None = None,
+        inverse: bool | None = None,
+        is_instance_field: bool | None = None,
+        field_required_evaluate_as_int: bool | None = None,
         fk_stored_field_name=None,
         field_required_inline_set=None,
     ) -> bool:
@@ -88,9 +85,7 @@ class RequiredFieldValidator(BaseFormValidator):
             field_required_has_value = self.get(field_required, inline_set=inline_set)
 
         if field in self.cleaned_data:
-            if DWTA in responses and optional_if_dwta and field_value == DWTA:
-                pass
-            elif (
+            if (DWTA in responses and optional_if_dwta and field_value == DWTA) or (
                 NOT_APPLICABLE in responses
                 and optional_if_na
                 and field_value == NOT_APPLICABLE
@@ -123,9 +118,9 @@ class RequiredFieldValidator(BaseFormValidator):
         self,
         condition: bool,
         field_required: str = None,
-        required_msg: Optional[str] = None,
-        not_required_msg: Optional[str] = None,
-        inverse: Optional[bool] = None,
+        required_msg: str | None = None,
+        not_required_msg: str | None = None,
+        inverse: bool | None = None,
     ) -> bool:
         inverse = True if inverse is None else inverse
         if not field_required:
@@ -151,8 +146,8 @@ class RequiredFieldValidator(BaseFormValidator):
         self,
         condition: bool,
         field: str = None,
-        msg: Optional[str] = None,
-        is_instance_field: Optional[bool] = None,
+        msg: str | None = None,
+        is_instance_field: bool | None = None,
     ) -> bool:
         """Raises a ValidationError if condition is True stating the
         field is NOT required.
@@ -177,12 +172,12 @@ class RequiredFieldValidator(BaseFormValidator):
         self,
         field: str = None,
         field_required: str = None,
-        required_msg: Optional[str] = None,
-        not_required_msg: Optional[str] = None,
-        optional_if_dwta: Optional[bool] = None,
-        inverse: Optional[bool] = None,
-        field_required_evaluate_as_int: Optional[bool] = None,
-        is_instance_field: Optional[bool] = None,
+        required_msg: str | None = None,
+        not_required_msg: str | None = None,
+        optional_if_dwta: bool | None = None,
+        inverse: bool | None = None,
+        field_required_evaluate_as_int: bool | None = None,
+        is_instance_field: bool | None = None,
     ) -> bool:
         """Raises an exception or returns False.
 
@@ -225,15 +220,15 @@ class RequiredFieldValidator(BaseFormValidator):
 
     def not_required_if(
         self,
-        *responses: Union[str, int, bool],
+        *responses: str | int | bool,
         field: str = None,
         field_required: str = None,
-        field_not_required: Optional[str] = None,
-        required_msg: Optional[str] = None,
-        not_required_msg: Optional[str] = None,
-        optional_if_dwta: Optional[bool] = None,
-        inverse: Optional[bool] = None,
-        is_instance_field: Optional[bool] = None,
+        field_not_required: str | None = None,
+        required_msg: str | None = None,
+        not_required_msg: str | None = None,
+        optional_if_dwta: bool | None = None,
+        inverse: bool | None = None,
+        is_instance_field: bool | None = None,
     ) -> bool:
         """Raises an exception or returns False.
 
@@ -266,8 +261,8 @@ class RequiredFieldValidator(BaseFormValidator):
         self,
         field: str = None,
         field_required: str = None,
-        required_msg: Optional[str] = None,
-        is_instance_field: Optional[bool] = None,
+        required_msg: str | None = None,
+        is_instance_field: bool | None = None,
     ) -> bool:
         """Required `b` if `a`; do not require `b` if not `a`"""
         if is_instance_field:
@@ -286,16 +281,16 @@ class RequiredFieldValidator(BaseFormValidator):
 
     @staticmethod
     def _inspect_params(
-        *responses: Union[str, int, bool], field: str = None, field_required: str = None
+        *responses: str | int | bool, field: str = None, field_required: str = None
     ) -> bool:
         """Inspects params and raises if any are None"""
         if not field:
             errmsg = _("`field` cannot be `None`")
             raise InvalidModelFormFieldValidator(f"{errmsg}.")
-        elif not responses:
+        if not responses:
             errmsg = _(f"At least one valid response for field '{field}' must be provided.")
             raise InvalidModelFormFieldValidator(errmsg)
-        elif not field_required:
+        if not field_required:
             raise InvalidModelFormFieldValidator('"field_required" cannot be None.')
         return False
 

edc_form_validators/test_case_mixin.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.forms import ValidationError
 from django.test import TestCase
@@ -11,16 +11,16 @@ if TYPE_CHECKING:
 
 
 class FormValidatorTestCaseMixin:
-    form_validator_cls: Type[FormValidator] = None
-    form_validator_model_cls: Type[BaseUuidModel] = None
+    form_validator_cls: type[FormValidator] = None
+    form_validator_model_cls: type[BaseUuidModel] = None
 
     def validate_form_validator(
         self: FormValidatorTestCaseMixin,
         cleaned_data: dict,
         *,
         instance: BaseUuidModel | None = None,
-        model_cls: Type[BaseUuidModel] | None = None,
-        form_validator_cls: Type[FormValidator] | None = None,
+        model_cls: type[BaseUuidModel] | None = None,
+        form_validator_cls: type[FormValidator] | None = None,
     ) -> FormValidator:
         form_validator = (form_validator_cls or self.form_validator_cls)(
             cleaned_data=cleaned_data,

edc_identifier/admin.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib import admin
 from django_audit_fields import audit_fieldset_tuple
 
@@ -53,7 +51,7 @@ class IdentifierModelAdmin(admin.ModelAdmin):
     )
     search_fields = ("identifier", "subject_identifier", "linked_identifier")
 
-    def get_readonly_fields(self, request, obj=None) -> Tuple[str, ...]:
+    def get_readonly_fields(self, request, obj=None) -> tuple[str, ...]:
         return (
             "identifier",
             "protocol_number",

edc_identifier/identifier.py

@@ -114,9 +114,8 @@ class Identifier:
         """
         if not identifier:
             return identifier
-        else:
-            self.identifier_as_list = identifier.split(self.separator)
-            return "".join(self.identifier_as_list)
+        self.identifier_as_list = identifier.split(self.separator)
+        return "".join(self.identifier_as_list)
 
     def insert_separator(self, identifier):
         """Returns the identifier by reinserting the separator."""

edc_identifier/model_mixins.py

@@ -1,5 +1,4 @@
 import re
-from typing import Union
 from uuid import uuid4
 
 from django.apps import apps as django_apps
@@ -21,7 +20,7 @@ class NonUniqueSubjectIdentifierFieldMixin(models.Model):
 
     class Meta:
         abstract = True
-        indexes = [models.Index(fields=["subject_identifier"])]
+        indexes = (models.Index(fields=["subject_identifier"]),)
 
 
 class UniqueSubjectIdentifierFieldMixin(models.Model):
@@ -66,11 +65,9 @@ class SubjectIdentifierMethodsModelMixin(models.Model):
             self.subject_identifier = self.update_subject_identifier_on_save()
         super().save(*args, **kwargs)
 
-    def update_subject_identifier_on_save(self) -> Union[str, models.CharField]:
+    def update_subject_identifier_on_save(self) -> str | models.CharField:
         """Returns a subject_identifier if not already set."""
-        if not self.subject_identifier:
-            self.subject_identifier = self.get_or_create_identifier()
-        elif re.match(UUID_PATTERN, self.subject_identifier):
+        if not self.subject_identifier or re.match(UUID_PATTERN, self.subject_identifier):
             self.subject_identifier = self.get_or_create_identifier()
         return self.subject_identifier
 
@@ -115,7 +112,7 @@ class SubjectIdentifierMethodsModelMixin(models.Model):
         except MultipleObjectsReturned as e:
             raise IdentifierError(
                 "Cannot lookup a unique RegisteredSubject instance. "
-                "Identity {} is not unique. Got {}".format(self.identity, e)
+                f"Identity {self.identity} is not unique. Got {e}"
             )
         return obj
 
@@ -139,7 +136,7 @@ class UniqueSubjectIdentifierModelMixin(
 
     def get_subject_identifier_as_pk(self):
         """Returns the subject_identifier_as_pk"""
-        return self.subject_identifier_as_pk  # noqa
+        return self.subject_identifier_as_pk
 
     class Meta:
         abstract = True

edc_identifier/research_identifier.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from string import Formatter
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 
@@ -22,22 +22,20 @@ class IdentifierMissingTemplateValue(Exception):
 
 class ResearchIdentifier:
     label: str = None  # e.g. subject_identifier, plot_identifier, etc
-    identifier_type: Optional[str] = (
-        None  # e.g. 'subject', 'infant', 'plot', a.k.a subject_type
-    )
-    template: Optional[str] = None
+    identifier_type: str | None = None  # e.g. 'subject', 'infant', 'plot', a.k.a subject_type
+    template: str | None = None
     padding: int = 5
     checkdigit = LuhnMixin()
 
     def __init__(
         self,
-        identifier_type: Optional[str] = None,
-        template: Optional[str] = None,
-        device_id: Optional[str] = None,
-        protocol_number: Optional[str] = None,
-        site: Optional[Site] = None,
-        requesting_model: Optional[str] = None,
-        identifier: Optional[str] = None,
+        identifier_type: str | None = None,
+        template: str | None = None,
+        device_id: str | None = None,
+        protocol_number: str | None = None,
+        site: Site | None = None,
+        requesting_model: str | None = None,
+        identifier: str | None = None,
     ) -> None:
         self._identifier = None
         self.requesting_model = requesting_model

edc_identifier/short_identifier.py

@@ -75,7 +75,7 @@ class ShortIdentifier:
             raise ShortIdentifierPrefixError(
                 "Prefix does not match prefix pattern. Got prefix=None."
             )
-        elif self.prefix and not self.prefix_pattern.match(self.prefix):
+        if self.prefix and not self.prefix_pattern.match(self.prefix):
             raise ShortIdentifierPrefixError(
                 "Prefix does not match prefix pattern. "
                 f"Got '{self.prefix}' does not match "