Skip to content

Commit 2711f57

Browse files
committed
Improve code style
1 parent d067121 commit 2711f57

File tree

4 files changed

+21
-11
lines changed

4 files changed

+21
-11
lines changed

import_export_extensions/admin/mixins/export_mixin.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ def _redirect_to_export_results_page(
315315
url = f"{url}?{query}"
316316
return HttpResponseRedirect(redirect_to=url)
317317

318-
def has_export_permission(self, request):
318+
def has_export_permission(self, request: WSGIRequest):
319319
"""Return whether a request has export permission."""
320320
EXPORT_PERMISSION_CODE = getattr(
321321
settings,
@@ -329,7 +329,11 @@ def has_export_permission(self, request):
329329
codename = get_permission_codename(EXPORT_PERMISSION_CODE, opts)
330330
return request.user.has_perm("%s.%s" % (opts.app_label, codename))
331331

332-
def changelist_view(self, request, context=None):
332+
def changelist_view(
333+
self,
334+
request: WSGIRequest,
335+
context: typing.Optional[dict[str, typing.Any]] = None,
336+
):
333337
"""Add the check for permission to changelist template context."""
334338
context = context or {}
335339
context["has_export_permission"] = True

import_export_extensions/admin/mixins/import_mixin.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ def _redirect_to_results_page(
372372

373373
return HttpResponseRedirect(redirect_to=url)
374374

375-
def has_import_permission(self, request):
375+
def has_import_permission(self, request: WSGIRequest):
376376
"""Return whether a request has import permission."""
377377
IMPORT_PERMISSION_CODE = getattr(
378378
settings,
@@ -386,7 +386,11 @@ def has_import_permission(self, request):
386386
codename = get_permission_codename(IMPORT_PERMISSION_CODE, opts)
387387
return request.user.has_perm("%s.%s" % (opts.app_label, codename))
388388

389-
def changelist_view(self, request, context=None):
389+
def changelist_view(
390+
self,
391+
request: WSGIRequest,
392+
context: typing.Optional[dict[str, typing.Any]] = None,
393+
):
390394
"""Add the check for permission to changelist template context."""
391395
context = context or {}
392396
context["has_import_permission"] = self.has_import_permission(request)

import_export_extensions/admin/model_admins/export_job_admin.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from django.contrib import admin, messages
44
from django.core.handlers.wsgi import WSGIRequest
5+
from django.db.models import QuerySet
56
from django.http import JsonResponse
67
from django.urls import re_path
78
from django.utils.translation import gettext_lazy as _
@@ -36,9 +37,9 @@ class ExportJobAdmin(
3637
export_job_model = models.ExportJob
3738
list_filter = ("export_status",)
3839
list_select_related = ("created_by",)
39-
actions = [
40+
actions = (
4041
"cancel_jobs",
41-
]
42+
)
4243

4344
def export_data_action(
4445
self,
@@ -215,7 +216,7 @@ def get_fieldsets(
215216
return [status, traceback_fields, export_params]
216217

217218
@admin.action(description="Cancel selected jobs")
218-
def cancel_jobs(self, request, queryset):
219+
def cancel_jobs(self, request: WSGIRequest, queryset: QuerySet):
219220
"""Admin action for cancelling data export."""
220221
for job in queryset:
221222
try:

import_export_extensions/admin/model_admins/import_job_admin.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from django.contrib import admin, messages
44
from django.core.handlers.wsgi import WSGIRequest
5+
from django.db.models import QuerySet
56
from django.http import JsonResponse
67
from django.template.loader import render_to_string
78
from django.urls import re_path
@@ -38,10 +39,10 @@ class ImportJobAdmin(
3839
import_job_model = models.ImportJob
3940
list_filter = ("import_status",)
4041
list_select_related = ("created_by",)
41-
actions = [
42+
actions = (
4243
"cancel_jobs",
4344
"confirm_jobs",
44-
]
45+
)
4546

4647
def get_queryset(self, request: WSGIRequest):
4748
"""Override `get_queryset`.
@@ -260,7 +261,7 @@ def get_fieldsets(
260261
return [status, traceback_, import_params]
261262

262263
@admin.action(description="Cancel selected jobs")
263-
def cancel_jobs(self, request, queryset):
264+
def cancel_jobs(self, request: WSGIRequest, queryset: QuerySet):
264265
"""Admin action for cancelling data import."""
265266
for job in queryset:
266267
try:
@@ -274,7 +275,7 @@ def cancel_jobs(self, request, queryset):
274275
self.message_user(request, str(error), messages.ERROR)
275276

276277
@admin.action(description="Confirm selected jobs")
277-
def confirm_jobs(self, request, queryset):
278+
def confirm_jobs(self, request: WSGIRequest, queryset: QuerySet):
278279
"""Admin action for confirming data import."""
279280
for job in queryset:
280281
try:

0 commit comments

Comments
 (0)