Merge branch 'main' into release/2

coderedcorp · Aug 21, 2024 · 9b9b23e · 9b9b23e
2 parents 4b22b13 + 28b7dd6
commit 9b9b23e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/docs/releases.rst b/docs/releases.rst
@@ -2,6 +2,13 @@
 Release Notes
 =============
 
+
+2.5.1
+=====
+
+* Bug fix: Support Django 5.1
+
+
 2.5.0
 =====
 

diff --git a/wagtailcache/__init__.py b/wagtailcache/__init__.py
@@ -1,3 +1,3 @@
-release = ["2", "5", "0"]
+release = ["2", "5", "1"]
 __version__ = "{0}.{1}.{2}".format(release[0], release[1], release[2])
 __shortversion__ = "{0}.{1}".format(release[0], release[1])
diff --git a/wagtailcache/cache.py b/wagtailcache/cache.py
@@ -183,10 +183,9 @@ class FetchFromCacheMiddleware(MiddlewareMixin):
     Mostly stolen from ``django.middleware.cache.FetchFromCacheMiddleware``.
     """
 
-    def __init__(self, get_response=None):
+    def __init__(self, get_response):
         self._wagcache = caches[wagtailcache_settings.WAGTAIL_CACHE_BACKEND]
-        self.get_response = get_response
-        self._async_check()
+        super().__init__(get_response)
 
     def process_request(self, request: WSGIRequest) -> Optional[HttpResponse]:
         if not wagtailcache_settings.WAGTAIL_CACHE:
@@ -250,10 +249,9 @@ class UpdateCacheMiddleware(MiddlewareMixin):
     Mostly stolen from ``django.middleware.cache.UpdateCacheMiddleware``.
     """
 
-    def __init__(self, get_response=None):
+    def __init__(self, get_response):
         self._wagcache = caches[wagtailcache_settings.WAGTAIL_CACHE_BACKEND]
-        self.get_response = get_response
-        self._async_check()
+        super().__init__(get_response)
 
     def process_response(
         self, request: WSGIRequest, response: HttpResponse
@@ -411,13 +409,15 @@ def _wrapped_view_func(
         request: WSGIRequest, *args, **kwargs
     ) -> HttpResponse:
         # Try to fetch an already cached page from wagtail-cache.
-        response = FetchFromCacheMiddleware().process_request(request)
+        response = FetchFromCacheMiddleware(view_func).process_request(request)
         if response:
             return response
         # Since we don't have a response at this point, process the request.
         response = view_func(request, *args, **kwargs)
         # Cache the response.
-        response = UpdateCacheMiddleware().process_response(request, response)
+        response = UpdateCacheMiddleware(view_func).process_response(
+            request, response
+        )
         return response
 
     return _wrapped_view_func