Change the passthru implementation to use a subclass instead of an attribute

matthiask · matthiask · commit 71f6b4c02f4b · 2022-03-09T17:32:02.000+01:00
diff --git a/feincms3/root/middleware.py b/feincms3/root/middleware.py
@@ -40,8 +40,13 @@ def handler(request, page):
 
 from functools import wraps
 
-from django.http import HttpResponseRedirect
-from django.urls import is_valid_path
+from django.http import HttpResponseNotFound, HttpResponseRedirect
+
+
+class _UseRootMiddlewareResponse(HttpResponseNotFound):
+    """Used by feincms3.root.passthru to tell the middleware to do its thing"""
+
+    pass
 
 
 def create_page_if_404_middleware(*, queryset, handler, language_code_redirect=False):
@@ -72,8 +77,8 @@ def outer(get_response):
         def inner(request):
             response = get_response(request)
             if response.status_code != 404 or (
-                not getattr(response, "_root_middleware", False)
-                and is_valid_path(request.path_info)
+                request.resolver_match
+                and not isinstance(response, _UseRootMiddlewareResponse)
             ):
                 # Response is not a 404 OR the path can be resolved and running
                 # the middleware hasn't been requested explicitly.
diff --git a/feincms3/root/passthru.py b/feincms3/root/passthru.py
@@ -35,21 +35,14 @@
     reverse_passthru("imprint", urlconf=apps_urlconf())
 """
 
-from django.http import HttpResponseNotFound
 from django.urls import path
 
 from feincms3.applications import reverse_app
-
-
-def passthru(request):
-    response = HttpResponseNotFound()
-    # Trigger the root middleware
-    response._root_middleware = True
-    return response
+from feincms3.root.middleware import _UseRootMiddlewareResponse
 
 
 app_name = "passthru"
-urlpatterns = [path("", passthru, name="passthru")]
+urlpatterns = [path("", lambda request: _UseRootMiddlewareResponse(), name="passthru")]
 ignore_app_name_mismatch = True
 
 
