Skip to content

perf: update template renderer paths to use package qualifiers #18277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions warehouse/accounts/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def incomplete_password_resets(exc, request):
@view_config(
route_name="accounts.profile",
context=User,
renderer="accounts/profile.html",
renderer="warehouse:templates/accounts/profile.html",
decorator=[
origin_cache(1 * 24 * 60 * 60, stale_if_error=1 * 24 * 60 * 60) # 1 day each.
],
Expand Down Expand Up @@ -228,7 +228,7 @@ def profile(user, request):

@view_config(
route_name="accounts.search",
renderer="api/account_search.html",
renderer="warehouse:templates/api/account_search.html",
uses_session=True,
)
def accounts_search(request) -> dict[str, list[User]]:
Expand Down Expand Up @@ -266,7 +266,7 @@ def accounts_search(request) -> dict[str, list[User]]:

@view_config(
route_name="accounts.login",
renderer="accounts/login.html",
renderer="warehouse:templates/accounts/login.html",
uses_session=True,
require_csrf=True,
require_methods=False,
Expand Down Expand Up @@ -370,7 +370,7 @@ def login(request, redirect_field_name=REDIRECT_FIELD_NAME, _form_class=LoginFor

@view_config(
route_name="accounts.two-factor",
renderer="accounts/two-factor.html",
renderer="warehouse:templates/accounts/two-factor.html",
uses_session=True,
require_csrf=True,
require_methods=False,
Expand Down Expand Up @@ -580,7 +580,7 @@ def _remember_device(request, response, userid, two_factor_method) -> None:

@view_config(
route_name="accounts.recovery-code",
renderer="accounts/recovery-code.html",
renderer="warehouse:templates/accounts/recovery-code.html",
uses_session=True,
require_csrf=True,
require_methods=False,
Expand Down Expand Up @@ -640,7 +640,7 @@ def recovery_code(request, _form_class=RecoveryCodeAuthenticationForm):

@view_config(
route_name="accounts.logout",
renderer="accounts/logout.html",
renderer="warehouse:templates/accounts/logout.html",
uses_session=True,
require_csrf=True,
require_methods=False,
Expand Down Expand Up @@ -701,7 +701,7 @@ def logout(request, redirect_field_name=REDIRECT_FIELD_NAME):

@view_config(
route_name="accounts.register",
renderer="accounts/register.html",
renderer="warehouse:templates/accounts/register.html",
uses_session=True,
require_csrf=True,
require_methods=False,
Expand Down Expand Up @@ -773,7 +773,7 @@ def register(request, _form_class=RegistrationForm):

@view_config(
route_name="accounts.request-password-reset",
renderer="accounts/request-password-reset.html",
renderer="warehouse:templates/accounts/request-password-reset.html",
uses_session=True,
require_csrf=True,
require_methods=False,
Expand Down Expand Up @@ -862,7 +862,7 @@ def request_password_reset(request, _form_class=RequestPasswordResetForm):

@view_config(
route_name="accounts.reset-password",
renderer="accounts/reset-password.html",
renderer="warehouse:templates/accounts/reset-password.html",
uses_session=True,
require_csrf=True,
require_methods=False,
Expand Down Expand Up @@ -1070,7 +1070,7 @@ def _get_two_factor_data(request, _redirect_to="/"):

@view_config(
route_name="accounts.verify-organization-role",
renderer="accounts/organization-invite-confirmation.html",
renderer="warehouse:templates/accounts/organization-invite-confirmation.html",
require_methods=False,
uses_session=True,
permission=Permissions.AccountVerifyOrgRole,
Expand Down Expand Up @@ -1240,7 +1240,7 @@ def _error(message):

@view_config(
route_name="accounts.verify-project-role",
renderer="accounts/invite-confirmation.html",
renderer="warehouse:templates/accounts/invite-confirmation.html",
require_methods=False,
uses_session=True,
permission=Permissions.AccountVerifyProjectRole,
Expand Down Expand Up @@ -1498,7 +1498,7 @@ def view_terms_of_service(request):
@view_config(
route_name="includes.current-user-profile-callout",
context=User,
renderer="includes/accounts/profile-callout.html",
renderer="warehouse:templates/includes/accounts/profile-callout.html",
uses_session=True,
has_translations=True,
)
Expand All @@ -1509,7 +1509,7 @@ def profile_callout(user, request):
@view_config(
route_name="includes.profile-actions",
context=User,
renderer="includes/accounts/profile-actions.html",
renderer="warehouse:templates/includes/accounts/profile-actions.html",
uses_session=True,
has_translations=True,
)
Expand All @@ -1520,7 +1520,7 @@ def edit_profile_button(user, request):
@view_config(
route_name="includes.profile-public-email",
context=User,
renderer="includes/accounts/profile-public-email.html",
renderer="warehouse:templates/includes/accounts/profile-public-email.html",
uses_session=True,
has_translations=True,
)
Expand Down Expand Up @@ -1578,7 +1578,7 @@ def reauthenticate(request, _form_class=ReAuthenticateForm):

@view_defaults(
route_name="manage.account.publishing",
renderer="manage/account/publishing.html",
renderer="warehouse:templates/manage/account/publishing.html",
uses_session=True,
require_csrf=True,
require_methods=False,
Expand Down
12 changes: 6 additions & 6 deletions warehouse/admin/views/banners.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

@view_config(
route_name="admin.banner.list",
renderer="admin/banners/list.html",
renderer="warehouse.admin:templates/admin/banners/list.html",
permission=Permissions.AdminBannerRead,
request_method="GET",
uses_session=True,
Expand All @@ -25,7 +25,7 @@ def banner_list(request):

@view_config(
route_name="admin.banner.edit",
renderer="admin/banners/edit.html",
renderer="warehouse.admin:templates/admin/banners/edit.html",
permission=Permissions.AdminBannerRead,
request_method="GET",
uses_session=True,
Expand All @@ -34,7 +34,7 @@ def banner_list(request):
)
@view_config(
route_name="admin.banner.edit",
renderer="admin/banners/edit.html",
renderer="warehouse.admin:templates/admin/banners/edit.html",
permission=Permissions.AdminBannerWrite,
request_method="POST",
uses_session=True,
Expand All @@ -60,7 +60,7 @@ def edit_banner(request):

@view_config(
route_name="admin.banner.create",
renderer="admin/banners/edit.html",
renderer="warehouse.admin:templates/admin/banners/edit.html",
permission=Permissions.AdminBannerRead,
request_method="GET",
uses_session=True,
Expand All @@ -69,7 +69,7 @@ def edit_banner(request):
)
@view_config(
route_name="admin.banner.create",
renderer="admin/banners/edit.html",
renderer="warehouse.admin:templates/admin/banners/edit.html",
permission=Permissions.AdminBannerWrite,
request_method="POST",
uses_session=True,
Expand Down Expand Up @@ -124,7 +124,7 @@ def delete_banner(request):
uses_session=True,
require_csrf=True,
has_translations=True,
renderer="admin/banners/preview.html",
renderer="warehouse.admin:templates/admin/banners/preview.html",
)
def preview_banner(request):
id_ = request.matchdict["banner_id"]
Expand Down
2 changes: 1 addition & 1 deletion warehouse/admin/views/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

@view_config(
route_name="admin.dashboard",
renderer="admin/dashboard.html",
renderer="warehouse.admin:templates/admin/dashboard.html",
permission=Permissions.AdminDashboardRead,
uses_session=True,
)
Expand Down
4 changes: 2 additions & 2 deletions warehouse/admin/views/emails.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

@view_config(
route_name="admin.emails.list",
renderer="admin/emails/list.html",
renderer="warehouse.admin:templates/admin/emails/list.html",
permission=Permissions.AdminEmailsRead,
request_method="GET",
uses_session=True,
Expand Down Expand Up @@ -111,7 +111,7 @@ def email_mass(request):

@view_config(
route_name="admin.emails.detail",
renderer="admin/emails/detail.html",
renderer="warehouse.admin:templates/admin/emails/detail.html",
permission=Permissions.AdminEmailsRead,
request_method="GET",
uses_session=True,
Expand Down
2 changes: 1 addition & 1 deletion warehouse/admin/views/flags.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

@view_config(
route_name="admin.flags",
renderer="admin/flags/index.html",
renderer="warehouse.admin:templates/admin/flags/index.html",
permission=Permissions.AdminFlagsRead,
request_method="GET",
uses_session=True,
Expand Down
4 changes: 2 additions & 2 deletions warehouse/admin/views/includes.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

@view_config(
route_name="includes.administer-project-include",
renderer="includes/admin/administer-project-include.html",
renderer="warehouse:templates/includes/admin/administer-project-include.html",
uses_session=True,
)
def administer_project_include(request):
Expand Down Expand Up @@ -47,7 +47,7 @@ def administer_project_include(request):
@view_config(
route_name="includes.administer-user-include",
context=User,
renderer="includes/admin/administer-user-include.html",
renderer="warehouse:templates/includes/admin/administer-user-include.html",
uses_session=True,
)
def administer_user_include(user, request):
Expand Down
4 changes: 2 additions & 2 deletions warehouse/admin/views/ip_addresses.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

@view_config(
route_name="admin.ip_address.list",
renderer="admin/ip_addresses/list.html",
renderer="warehouse.admin:templates/admin/ip_addresses/list.html",
permission=Permissions.AdminIpAddressesRead,
uses_session=True,
)
Expand All @@ -46,7 +46,7 @@ def ip_address_list(request: Request) -> dict[str, SQLAlchemyORMPage[IpAddress]

@view_config(
route_name="admin.ip_address.detail",
renderer="admin/ip_addresses/detail.html",
renderer="warehouse.admin:templates/admin/ip_addresses/detail.html",
permission=Permissions.AdminIpAddressesRead,
uses_session=True,
)
Expand Down
2 changes: 1 addition & 1 deletion warehouse/admin/views/journals.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

@view_config(
route_name="admin.journals.list",
renderer="admin/journals/list.html",
renderer="warehouse.admin:templates/admin/journals/list.html",
permission=Permissions.AdminJournalRead,
uses_session=True,
)
Expand Down
6 changes: 3 additions & 3 deletions warehouse/admin/views/macaroons.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

@view_config(
route_name="admin.macaroon.decode_token",
renderer="admin/macaroons/decode_token.html",
renderer="warehouse.admin:templates/admin/macaroons/decode_token.html",
permission=Permissions.AdminMacaroonsRead,
request_method="GET",
uses_session=True,
Expand All @@ -23,7 +23,7 @@
)
@view_config(
route_name="admin.macaroon.decode_token",
renderer="admin/macaroons/decode_token.html",
renderer="warehouse.admin:templates/admin/macaroons/decode_token.html",
permission=Permissions.AdminMacaroonsRead,
request_method="POST",
uses_session=True,
Expand Down Expand Up @@ -59,7 +59,7 @@ def macaroon_decode_token(request):

@view_config(
route_name="admin.macaroon.detail",
renderer="admin/macaroons/detail.html",
renderer="warehouse.admin:templates/admin/macaroons/detail.html",
permission=Permissions.AdminMacaroonsRead,
uses_session=True,
)
Expand Down
6 changes: 3 additions & 3 deletions warehouse/admin/views/malware_reports.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

@view_config(
route_name="admin.malware_reports.list",
renderer="admin/malware_reports/list.html",
renderer="warehouse.admin:templates/admin/malware_reports/list.html",
permission=Permissions.AdminObservationsRead,
request_method="GET",
uses_session=True,
Expand Down Expand Up @@ -56,7 +56,7 @@ def malware_reports_list(request):

@view_config(
route_name="admin.malware_reports.project.list",
renderer="admin/malware_reports/project_list.html",
renderer="warehouse.admin:templates/admin/malware_reports/project_list.html",
permission=Permissions.AdminObservationsRead,
request_method="GET",
uses_session=True,
Expand Down Expand Up @@ -198,7 +198,7 @@ def malware_reports_project_verdict_remove_malware(project, request):

@view_config(
route_name="admin.malware_reports.detail",
renderer="admin/malware_reports/detail.html",
renderer="warehouse.admin:templates/admin/malware_reports/detail.html",
permission=Permissions.AdminObservationsRead,
request_method="GET",
uses_session=True,
Expand Down
2 changes: 1 addition & 1 deletion warehouse/admin/views/observations.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

@view_config(
route_name="admin.observations.list",
renderer="admin/observations/list.html",
renderer="warehouse.admin:templates/admin/observations/list.html",
permission=Permissions.AdminObservationsRead,
request_method="GET",
uses_session=True,
Expand Down
8 changes: 4 additions & 4 deletions warehouse/admin/views/organizations.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def _turbo_mode(request):

@view_config(
route_name="admin.organization.list",
renderer="admin/organizations/list.html",
renderer="warehouse.admin:templates/admin/organizations/list.html",
permission=Permissions.AdminOrganizationsRead,
uses_session=True,
)
Expand Down Expand Up @@ -147,7 +147,7 @@ def organization_list(request):
@view_config(
route_name="admin.organization.detail",
require_methods=False,
renderer="admin/organizations/detail.html",
renderer="warehouse.admin:templates/admin/organizations/detail.html",
permission=Permissions.AdminOrganizationsRead,
has_translations=True,
uses_session=True,
Expand Down Expand Up @@ -207,7 +207,7 @@ def organization_rename(request):

@view_config(
route_name="admin.organization_application.list",
renderer="admin/organization_applications/list.html",
renderer="warehouse.admin:templates/admin/organization_applications/list.html",
permission=Permissions.AdminOrganizationsRead,
uses_session=True,
)
Expand Down Expand Up @@ -319,7 +319,7 @@ def __init__(self, *args, organization_service, user, **kwargs):
@view_config(
route_name="admin.organization_application.detail",
require_methods=False,
renderer="admin/organization_applications/detail.html",
renderer="warehouse.admin:templates/admin/organization_applications/detail.html",
permission=Permissions.AdminOrganizationsRead,
has_translations=True,
uses_session=True,
Expand Down
2 changes: 1 addition & 1 deletion warehouse/admin/views/prohibited_email_domains.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

@view_config(
route_name="admin.prohibited_email_domains.list",
renderer="admin/prohibited_email_domains/list.html",
renderer="warehouse.admin:templates/admin/prohibited_email_domains/list.html",
permission=Permissions.AdminProhibitedEmailDomainsRead,
request_method="GET",
uses_session=True,
Expand Down
Loading