python: Use Django 5.2 reverse(…, query=…).

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2025-06-11 16:56:58 -07:00
committed by Tim Abbott
parent b10bf1dd20
commit 717cf60edf
10 changed files with 28 additions and 70 deletions

View File

@@ -19,7 +19,6 @@ from abc import ABC, abstractmethod
from collections.abc import Callable
from email.headerregistry import Address
from typing import Any, TypedDict, TypeVar, cast
from urllib.parse import urlencode
import magic
import orjson
@@ -88,7 +87,6 @@ from zerver.lib.request import RequestNotes
from zerver.lib.sessions import delete_user_sessions
from zerver.lib.subdomains import get_subdomain
from zerver.lib.types import ProfileDataElementUpdateDict
from zerver.lib.url_encoding import append_url_query_string
from zerver.lib.users import check_full_name, validate_user_custom_profile_field
from zerver.models import (
CustomProfileField,
@@ -1637,9 +1635,8 @@ def redirect_to_login(realm: Realm) -> HttpResponseRedirect:
def redirect_deactivated_user_to_login(realm: Realm, email: str) -> HttpResponseRedirect:
# Specifying the template name makes sure that the user is not redirected to dev_login in case of
# a deactivated account on a test server.
login_url = reverse("login_page", kwargs={"template_name": "zerver/login.html"})
redirect_url = append_url_query_string(
realm.url + login_url, urlencode({"is_deactivated": email})
redirect_url = realm.url + reverse(
"login_page", kwargs={"template_name": "zerver/login.html"}, query={"is_deactivated": email}
)
return HttpResponseRedirect(redirect_url)