Refs #32508 -- Raised ImproperlyConfigured instead of using "assert" in middlewares.

2 files changed, 15 insertions, 11 deletions

diff --git a/django/contrib/admindocs/middleware.py b/django/contrib/admindocs/middleware.py
index 4779db8366..cf8879d75a 100644
--- a/django/contrib/admindocs/middleware.py
+++ b/django/contrib/admindocs/middleware.py
@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
 from django.http import HttpResponse
 from django.utils.deprecation import MiddlewareMixin
 
@@ -16,11 +17,12 @@ class XViewMiddleware(MiddlewareMixin):
         header indicating the view function. This is used to lookup the view
         function for an arbitrary page.
         """
-        assert hasattr(request, 'user'), (
-            "The XView middleware requires authentication middleware to be "
-            "installed. Edit your MIDDLEWARE setting to insert "
-            "'django.contrib.auth.middleware.AuthenticationMiddleware'."
-        )
+        if not hasattr(request, 'user'):
+            raise ImproperlyConfigured(
+                "The XView middleware requires authentication middleware to "
+                "be installed. Edit your MIDDLEWARE setting to insert "
+                "'django.contrib.auth.middleware.AuthenticationMiddleware'."
+            )
         if request.method == 'HEAD' and (request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS or
                                          (request.user.is_active and request.user.is_staff)):
             response = HttpResponse()
diff --git a/django/contrib/auth/middleware.py b/django/contrib/auth/middleware.py
index 5bd176ef69..1cd84f1cc9 100644
--- a/django/contrib/auth/middleware.py
+++ b/django/contrib/auth/middleware.py
@@ -14,12 +14,14 @@ def get_user(request):
 
 class AuthenticationMiddleware(MiddlewareMixin):
     def process_request(self, request):
-        assert hasattr(request, 'session'), (
-            "The Django authentication middleware requires session middleware "
-            "to be installed. Edit your MIDDLEWARE setting to insert "
-            "'django.contrib.sessions.middleware.SessionMiddleware' before "
-            "'django.contrib.auth.middleware.AuthenticationMiddleware'."
-        )
+        if not hasattr(request, 'session'):
+            raise ImproperlyConfigured(
+                "The Django authentication middleware requires session "
+                "middleware to be installed. Edit your MIDDLEWARE setting to "
+                "insert "
+                "'django.contrib.sessions.middleware.SessionMiddleware' before "
+                "'django.contrib.auth.middleware.AuthenticationMiddleware'."
+            )
         request.user = SimpleLazyObject(lambda: get_user(request))