Skip to content

Enable django-upgrade #157

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.

Sign up for GitHub

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

Merged
sergei-maertens merged 2 commits into from
Dec 4, 2025
Merged

Enable django-upgrade #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b96dde5
Add django-upgrade to pre-commit hooks
ulgens Dec 4, 2025
6a08596
Apply django-upgrade fixes
ulgens Dec 4, 2025
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
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,8 @@ repos:
rev: v5.0.0
hooks:
- id: check-merge-conflict

- repo: https://github.com/adamchainz/django-upgrade
rev: 1.29.1
hooks:
- id: django-upgrade
4 changes: 2 additions & 2 deletions cookie_consent/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
from .models import Cookie, CookieGroup, LogItem


@admin.register(Cookie)
class CookieAdmin(admin.ModelAdmin):
list_display = ("varname", "name", "cookiegroup", "path", "domain", "get_version")
search_fields = ("name", "domain", "cookiegroup__varname", "cookiegroup__name")
readonly_fields = ("varname",)
list_filter = ("cookiegroup",)


@admin.register(CookieGroup)
class CookieGroupAdmin(admin.ModelAdmin):
list_display = (
"varname",
Expand Down Expand Up @@ -58,7 +60,5 @@ class LogItemAdmin(admin.ModelAdmin):
date_hierarchy = "created"


admin.site.register(Cookie, CookieAdmin)
admin.site.register(CookieGroup, CookieGroupAdmin)
if settings.COOKIE_CONSENT_LOG_ENABLED:
admin.site.register(LogItem, LogItemAdmin)
2 changes: 1 addition & 1 deletion tests/test_middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def _accept_and_set_cookie(self):
consent_response = self.client.post(
endpoint,
follow=True,
HTTP_X_REQUESTED_WITH="XMLHttpRequest",
headers={"x-requested-with": "XMLHttpRequest"},
)
self.assertEqual(consent_response.status_code, 200)

Expand Down
4 changes: 2 additions & 2 deletions tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def test_accept_cookie(self):
def test_accept_cookie_ajax(self):
response = self.client.post(
reverse("cookie_consent_accept", kwargs={"varname": "optional"}),
HTTP_X_REQUESTED_WITH="XMLHttpRequest",
headers={"x-requested-with": "XMLHttpRequest"},
)
self.assertEqual(response.status_code, 200)

Expand All @@ -93,7 +93,7 @@ def test_decline_cookie(self):
def test_decline_cookie_ajax(self):
response = self.client.delete(
reverse("cookie_consent_decline", kwargs={"varname": "optional"}),
HTTP_X_REQUESTED_WITH="XMLHttpRequest",
headers={"x-requested-with": "XMLHttpRequest"},
)
self.assertEqual(response.status_code, 200)

Expand Down