ruff: Fix UP007 Use X | Y for type annotations.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2024-07-11 17:30:23 -07:00
committed by Tim Abbott
parent e08a24e47f
commit 531b34cb4c
355 changed files with 2759 additions and 3029 deletions

View File

@@ -1,4 +1,4 @@
from typing import Annotated, Optional
from typing import Annotated
import orjson
from django.core.exceptions import ValidationError
@@ -109,10 +109,10 @@ def validate_custom_profile_field(
def validate_custom_profile_field_update(
field: CustomProfileField,
display_in_profile_summary: Optional[bool] = None,
field_data: Optional[ProfileFieldData] = None,
name: Optional[str] = None,
hint: Optional[str] = None,
display_in_profile_summary: bool | None = None,
field_data: ProfileFieldData | None = None,
name: str | None = None,
hint: str | None = None,
) -> None:
if name is None:
name = field.name
@@ -140,9 +140,9 @@ def validate_custom_profile_field_update(
def update_only_display_in_profile_summary(
existing_field: CustomProfileField,
requested_field_data: Optional[ProfileFieldData] = None,
requested_name: Optional[str] = None,
requested_hint: Optional[str] = None,
requested_field_data: ProfileFieldData | None = None,
requested_name: str | None = None,
requested_hint: str | None = None,
) -> bool:
if (
(requested_name is not None and requested_name != existing_field.name)
@@ -157,7 +157,7 @@ def update_only_display_in_profile_summary(
def display_in_profile_summary_limit_reached(
realm: Realm, profile_field_id: Optional[int] = None
realm: Realm, profile_field_id: int | None = None
) -> bool:
query = CustomProfileField.objects.filter(realm=realm, display_in_profile_summary=True)
if profile_field_id is not None:
@@ -173,7 +173,7 @@ def create_realm_custom_profile_field(
*,
name: Annotated[str, StringConstraints(strip_whitespace=True)] = "",
hint: str = "",
field_data: Optional[Json[ProfileFieldData]] = None,
field_data: Json[ProfileFieldData] | None = None,
field_type: Json[int],
display_in_profile_summary: Json[bool] = False,
required: Json[bool] = False,
@@ -232,11 +232,11 @@ def update_realm_custom_profile_field(
user_profile: UserProfile,
*,
field_id: PathOnly[int],
name: Optional[Annotated[str, StringConstraints(strip_whitespace=True)]] = None,
hint: Optional[str] = None,
field_data: Optional[Json[ProfileFieldData]] = None,
required: Optional[Json[bool]] = None,
display_in_profile_summary: Optional[Json[bool]] = None,
name: Annotated[str, StringConstraints(strip_whitespace=True)] | None = None,
hint: str | None = None,
field_data: Json[ProfileFieldData] | None = None,
required: Json[bool] | None = None,
display_in_profile_summary: Json[bool] | None = None,
) -> HttpResponse:
realm = user_profile.realm
try: