🚨 Enable the pyupgrade rules

Automatic upgrade for the modern type annotations. Some manual
fixes were required for the string interpolation.

Along the way, the varname for an individual cookie is deprecated.

A code search in Github revealed that the accepted_cookies template
tag does not appear to be used in any public projects. Deprecating
it should be safe - I also can't really imagine how/why you'd use
this tag as it's documented and more common to check whether an
entire cookie group is accepted.

Author: sergei-maertens

cookie_consent/admin.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.contrib import admin
 
 from .conf import settings

cookie_consent/cache.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.core.cache import caches
 
 from .conf import settings

cookie_consent/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.conf import settings  # NOQA
 
 from appconf import AppConf

cookie_consent/middleware.py

@@ -1,12 +1,9 @@
-# -*- coding: utf-8 -*-
-from typing import Optional
-
 from .cache import all_cookie_groups
 from .conf import settings
 from .util import get_cookie_dict_from_request, is_cookie_consent_enabled
 
 
-def _should_delete_cookie(group_version: Optional[str]) -> bool:
+def _should_delete_cookie(group_version: str | None) -> bool:
     # declined after it was accepted (and set) before
     if group_version == settings.COOKIE_CONSENT_DECLINE:
         return True

cookie_consent/models.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import re
 from typing import TypedDict
 
@@ -144,7 +143,7 @@ class Meta:
         ordering = ["-created"]
 
     def __str__(self):
-        return "%s %s%s" % (self.name, self.domain, self.path)
+        return f"{self.name} {self.domain}{self.path}"
 
     @clear_cache_after
     def save(self, *args, **kwargs):
@@ -161,7 +160,8 @@ def natural_key(self):
 
     @property
     def varname(self):
-        return "%s=%s:%s" % (self.cookiegroup.varname, self.name, self.domain)
+        group_varname = self.cookiegroup.varname
+        return f"{group_varname}={self.name}:{self.domain}"
 
     def get_version(self):
         return self.created.isoformat()
@@ -191,4 +191,4 @@ class Meta:
         ordering = ["-created"]
 
     def __str__(self):
-        return "%s %s" % (self.cookiegroup.name, self.version)
+        return f"{self.cookiegroup.name} {self.version}"

cookie_consent/templatetags/__init__.py

@@ -1,2 +1 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-

cookie_consent/templatetags/cookie_consent_tags.py

@@ -166,6 +166,12 @@ def accepted_cookies(request):
         {{ request|accepted_cookies }}
 
     """
+    warnings.warn(
+        "The 'accepted_cookies' template filter is deprecated and will be removed"
+        "in django-cookie-consent 1.0.",
+        DeprecationWarning,
+        stacklevel=1,
+    )
     return [c.varname for c in get_accepted_cookies(request)]
 
 

cookie_consent/urls.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.urls import path, re_path
 from django.views.decorators.csrf import csrf_exempt
 

cookie_consent/util.py

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
 import datetime
 import logging
-from typing import Dict, Union
 
 from .cache import all_cookie_groups, get_cookie, get_cookie_group
 from .conf import settings
@@ -13,7 +11,7 @@
 KEY_VALUE_SEP = "="
 
 
-def parse_cookie_str(cookie: str) -> Dict[str, str]:
+def parse_cookie_str(cookie: str) -> dict[str, str]:
     if not cookie:
         return {}
 
@@ -171,7 +169,7 @@ def are_all_cookies_accepted(request):
     )
 
 
-def _get_cookie_groups_by_state(request, state: Union[bool, None]):
+def _get_cookie_groups_by_state(request, state: bool | None):
     return [
         cookie_group
         for cookie_group in get_cookie_groups()
@@ -219,7 +217,7 @@ def get_cookie_string(cookie_dic):
     expires = datetime.datetime.now() + datetime.timedelta(
         seconds=settings.COOKIE_CONSENT_MAX_AGE
     )
-    cookie_str = "%s=%s; expires=%s; path=/" % (
+    cookie_str = "{}={}; expires={}; path=/".format(
         settings.COOKIE_CONSENT_NAME,
         dict_to_cookie_str(cookie_dic),
         expires.strftime("%a, %d %b %Y %H:%M:%S GMT"),

cookie_consent/views.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django.contrib.auth.views import RedirectURLMixin
 from django.core.exceptions import SuspiciousOperation
 from django.http import HttpRequest, HttpResponse, HttpResponseRedirect, JsonResponse