Skip to content

Commit 3bc1006

Browse files
perf: update template renderer paths to use package qualifiers (#18277)
Co-authored-by: Mike Fiedler <[email protected]>
1 parent e80d925 commit 3bc1006

29 files changed

+120
-118
lines changed

warehouse/accounts/views.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def incomplete_password_resets(exc, request):
152152
@view_config(
153153
route_name="accounts.profile",
154154
context=User,
155-
renderer="accounts/profile.html",
155+
renderer="warehouse:templates/accounts/profile.html",
156156
decorator=[
157157
origin_cache(1 * 24 * 60 * 60, stale_if_error=1 * 24 * 60 * 60) # 1 day each.
158158
],
@@ -229,7 +229,7 @@ def profile(user, request):
229229

230230
@view_config(
231231
route_name="accounts.search",
232-
renderer="api/account_search.html",
232+
renderer="warehouse:templates/api/account_search.html",
233233
uses_session=True,
234234
)
235235
def accounts_search(request) -> dict[str, list[User]]:
@@ -267,7 +267,7 @@ def accounts_search(request) -> dict[str, list[User]]:
267267

268268
@view_config(
269269
route_name="accounts.login",
270-
renderer="accounts/login.html",
270+
renderer="warehouse:templates/accounts/login.html",
271271
uses_session=True,
272272
require_csrf=True,
273273
require_methods=False,
@@ -356,7 +356,7 @@ def login(request, redirect_field_name=REDIRECT_FIELD_NAME, _form_class=LoginFor
356356

357357
@view_config(
358358
route_name="accounts.two-factor",
359-
renderer="accounts/two-factor.html",
359+
renderer="warehouse:templates/accounts/two-factor.html",
360360
uses_session=True,
361361
require_csrf=True,
362362
require_methods=False,
@@ -571,7 +571,7 @@ def _remember_device(request, response, userid, two_factor_method) -> None:
571571

572572
@view_config(
573573
route_name="accounts.recovery-code",
574-
renderer="accounts/recovery-code.html",
574+
renderer="warehouse:templates/accounts/recovery-code.html",
575575
uses_session=True,
576576
require_csrf=True,
577577
require_methods=False,
@@ -626,7 +626,7 @@ def recovery_code(request, _form_class=RecoveryCodeAuthenticationForm):
626626

627627
@view_config(
628628
route_name="accounts.logout",
629-
renderer="accounts/logout.html",
629+
renderer="warehouse:templates/accounts/logout.html",
630630
uses_session=True,
631631
require_csrf=True,
632632
require_methods=False,
@@ -687,7 +687,7 @@ def logout(request, redirect_field_name=REDIRECT_FIELD_NAME):
687687

688688
@view_config(
689689
route_name="accounts.register",
690-
renderer="accounts/register.html",
690+
renderer="warehouse:templates/accounts/register.html",
691691
uses_session=True,
692692
require_csrf=True,
693693
require_methods=False,
@@ -762,7 +762,7 @@ def register(request, _form_class=RegistrationForm):
762762

763763
@view_config(
764764
route_name="accounts.request-password-reset",
765-
renderer="accounts/request-password-reset.html",
765+
renderer="warehouse:templates/accounts/request-password-reset.html",
766766
uses_session=True,
767767
require_csrf=True,
768768
require_methods=False,
@@ -851,7 +851,7 @@ def request_password_reset(request, _form_class=RequestPasswordResetForm):
851851

852852
@view_config(
853853
route_name="accounts.reset-password",
854-
renderer="accounts/reset-password.html",
854+
renderer="warehouse:templates/accounts/reset-password.html",
855855
uses_session=True,
856856
require_csrf=True,
857857
require_methods=False,
@@ -1061,7 +1061,7 @@ def _get_two_factor_data(request, _redirect_to="/"):
10611061

10621062
@view_config(
10631063
route_name="accounts.verify-organization-role",
1064-
renderer="accounts/organization-invite-confirmation.html",
1064+
renderer="warehouse:templates/accounts/organization-invite-confirmation.html",
10651065
require_methods=False,
10661066
uses_session=True,
10671067
permission=Permissions.AccountVerifyOrgRole,
@@ -1231,7 +1231,7 @@ def _error(message):
12311231

12321232
@view_config(
12331233
route_name="accounts.verify-project-role",
1234-
renderer="accounts/invite-confirmation.html",
1234+
renderer="warehouse:templates/accounts/invite-confirmation.html",
12351235
require_methods=False,
12361236
uses_session=True,
12371237
permission=Permissions.AccountVerifyProjectRole,
@@ -1489,7 +1489,7 @@ def view_terms_of_service(request):
14891489
@view_config(
14901490
route_name="includes.current-user-profile-callout",
14911491
context=User,
1492-
renderer="includes/accounts/profile-callout.html",
1492+
renderer="warehouse:templates/includes/accounts/profile-callout.html",
14931493
uses_session=True,
14941494
has_translations=True,
14951495
)
@@ -1500,7 +1500,7 @@ def profile_callout(user, request):
15001500
@view_config(
15011501
route_name="includes.profile-actions",
15021502
context=User,
1503-
renderer="includes/accounts/profile-actions.html",
1503+
renderer="warehouse:templates/includes/accounts/profile-actions.html",
15041504
uses_session=True,
15051505
has_translations=True,
15061506
)
@@ -1511,7 +1511,7 @@ def edit_profile_button(user, request):
15111511
@view_config(
15121512
route_name="includes.profile-public-email",
15131513
context=User,
1514-
renderer="includes/accounts/profile-public-email.html",
1514+
renderer="warehouse:templates/includes/accounts/profile-public-email.html",
15151515
uses_session=True,
15161516
has_translations=True,
15171517
)
@@ -1569,7 +1569,7 @@ def reauthenticate(request, _form_class=ReAuthenticateForm):
15691569

15701570
@view_defaults(
15711571
route_name="manage.account.publishing",
1572-
renderer="manage/account/publishing.html",
1572+
renderer="warehouse:templates/manage/account/publishing.html",
15731573
uses_session=True,
15741574
require_csrf=True,
15751575
require_methods=False,

warehouse/admin/views/banners.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
@view_config(
1515
route_name="admin.banner.list",
16-
renderer="admin/banners/list.html",
16+
renderer="warehouse.admin:templates/admin/banners/list.html",
1717
permission=Permissions.AdminBannerRead,
1818
request_method="GET",
1919
uses_session=True,
@@ -25,7 +25,7 @@ def banner_list(request):
2525

2626
@view_config(
2727
route_name="admin.banner.edit",
28-
renderer="admin/banners/edit.html",
28+
renderer="warehouse.admin:templates/admin/banners/edit.html",
2929
permission=Permissions.AdminBannerRead,
3030
request_method="GET",
3131
uses_session=True,
@@ -34,7 +34,7 @@ def banner_list(request):
3434
)
3535
@view_config(
3636
route_name="admin.banner.edit",
37-
renderer="admin/banners/edit.html",
37+
renderer="warehouse.admin:templates/admin/banners/edit.html",
3838
permission=Permissions.AdminBannerWrite,
3939
request_method="POST",
4040
uses_session=True,
@@ -60,7 +60,7 @@ def edit_banner(request):
6060

6161
@view_config(
6262
route_name="admin.banner.create",
63-
renderer="admin/banners/edit.html",
63+
renderer="warehouse.admin:templates/admin/banners/edit.html",
6464
permission=Permissions.AdminBannerRead,
6565
request_method="GET",
6666
uses_session=True,
@@ -69,7 +69,7 @@ def edit_banner(request):
6969
)
7070
@view_config(
7171
route_name="admin.banner.create",
72-
renderer="admin/banners/edit.html",
72+
renderer="warehouse.admin:templates/admin/banners/edit.html",
7373
permission=Permissions.AdminBannerWrite,
7474
request_method="POST",
7575
uses_session=True,
@@ -124,7 +124,7 @@ def delete_banner(request):
124124
uses_session=True,
125125
require_csrf=True,
126126
has_translations=True,
127-
renderer="admin/banners/preview.html",
127+
renderer="warehouse.admin:templates/admin/banners/preview.html",
128128
)
129129
def preview_banner(request):
130130
id_ = request.matchdict["banner_id"]

warehouse/admin/views/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
@view_config(
1818
route_name="admin.dashboard",
19-
renderer="admin/dashboard.html",
19+
renderer="warehouse.admin:templates/admin/dashboard.html",
2020
permission=Permissions.AdminDashboardRead,
2121
uses_session=True,
2222
)

warehouse/admin/views/emails.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
@view_config(
2222
route_name="admin.emails.list",
23-
renderer="admin/emails/list.html",
23+
renderer="warehouse.admin:templates/admin/emails/list.html",
2424
permission=Permissions.AdminEmailsRead,
2525
request_method="GET",
2626
uses_session=True,
@@ -111,7 +111,7 @@ def email_mass(request):
111111

112112
@view_config(
113113
route_name="admin.emails.detail",
114-
renderer="admin/emails/detail.html",
114+
renderer="warehouse.admin:templates/admin/emails/detail.html",
115115
permission=Permissions.AdminEmailsRead,
116116
request_method="GET",
117117
uses_session=True,

warehouse/admin/views/flags.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
@view_config(
1111
route_name="admin.flags",
12-
renderer="admin/flags/index.html",
12+
renderer="warehouse.admin:templates/admin/flags/index.html",
1313
permission=Permissions.AdminFlagsRead,
1414
request_method="GET",
1515
uses_session=True,

warehouse/admin/views/includes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
@view_config(
1111
route_name="includes.administer-project-include",
12-
renderer="includes/admin/administer-project-include.html",
12+
renderer="warehouse:templates/includes/admin/administer-project-include.html",
1313
uses_session=True,
1414
)
1515
def administer_project_include(request):
@@ -47,7 +47,7 @@ def administer_project_include(request):
4747
@view_config(
4848
route_name="includes.administer-user-include",
4949
context=User,
50-
renderer="includes/admin/administer-user-include.html",
50+
renderer="warehouse:templates/includes/admin/administer-user-include.html",
5151
uses_session=True,
5252
)
5353
def administer_user_include(user, request):

warehouse/admin/views/ip_addresses.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

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

4747
@view_config(
4848
route_name="admin.ip_address.detail",
49-
renderer="admin/ip_addresses/detail.html",
49+
renderer="warehouse.admin:templates/admin/ip_addresses/detail.html",
5050
permission=Permissions.AdminIpAddressesRead,
5151
uses_session=True,
5252
)

warehouse/admin/views/journals.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
@view_config(
1717
route_name="admin.journals.list",
18-
renderer="admin/journals/list.html",
18+
renderer="warehouse.admin:templates/admin/journals/list.html",
1919
permission=Permissions.AdminJournalRead,
2020
uses_session=True,
2121
)

warehouse/admin/views/macaroons.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
@view_config(
1616
route_name="admin.macaroon.decode_token",
17-
renderer="admin/macaroons/decode_token.html",
17+
renderer="warehouse.admin:templates/admin/macaroons/decode_token.html",
1818
permission=Permissions.AdminMacaroonsRead,
1919
request_method="GET",
2020
uses_session=True,
@@ -23,7 +23,7 @@
2323
)
2424
@view_config(
2525
route_name="admin.macaroon.decode_token",
26-
renderer="admin/macaroons/decode_token.html",
26+
renderer="warehouse.admin:templates/admin/macaroons/decode_token.html",
2727
permission=Permissions.AdminMacaroonsRead,
2828
request_method="POST",
2929
uses_session=True,
@@ -59,7 +59,7 @@ def macaroon_decode_token(request):
5959

6060
@view_config(
6161
route_name="admin.macaroon.detail",
62-
renderer="admin/macaroons/detail.html",
62+
renderer="warehouse.admin:templates/admin/macaroons/detail.html",
6363
permission=Permissions.AdminMacaroonsRead,
6464
uses_session=True,
6565
)

warehouse/admin/views/malware_reports.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
@view_config(
2828
route_name="admin.malware_reports.list",
29-
renderer="admin/malware_reports/list.html",
29+
renderer="warehouse.admin:templates/admin/malware_reports/list.html",
3030
permission=Permissions.AdminObservationsRead,
3131
request_method="GET",
3232
uses_session=True,
@@ -56,7 +56,7 @@ def malware_reports_list(request):
5656

5757
@view_config(
5858
route_name="admin.malware_reports.project.list",
59-
renderer="admin/malware_reports/project_list.html",
59+
renderer="warehouse.admin:templates/admin/malware_reports/project_list.html",
6060
permission=Permissions.AdminObservationsRead,
6161
request_method="GET",
6262
uses_session=True,
@@ -198,7 +198,7 @@ def malware_reports_project_verdict_remove_malware(project, request):
198198

199199
@view_config(
200200
route_name="admin.malware_reports.detail",
201-
renderer="admin/malware_reports/detail.html",
201+
renderer="warehouse.admin:templates/admin/malware_reports/detail.html",
202202
permission=Permissions.AdminObservationsRead,
203203
request_method="GET",
204204
uses_session=True,

0 commit comments

Comments
 (0)