From 9baf692a58de78dba13aa582098781675367c329 Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Sat, 7 Nov 2015 16:12:37 +0100 Subject: Fixed #26601 -- Improved middleware per DEP 0005. Thanks Tim Graham for polishing the patch, updating the tests, and writing documentation. Thanks Carl Meyer for shepherding the DEP. --- tests/urlpatterns_reverse/middleware.py | 13 +++++++------ tests/urlpatterns_reverse/tests.py | 12 ++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'tests/urlpatterns_reverse') diff --git a/tests/urlpatterns_reverse/middleware.py b/tests/urlpatterns_reverse/middleware.py index 13c3d104b6..8c40125f10 100644 --- a/tests/urlpatterns_reverse/middleware.py +++ b/tests/urlpatterns_reverse/middleware.py @@ -1,37 +1,38 @@ from django.http import HttpResponse, StreamingHttpResponse from django.urls import reverse +from django.utils.deprecation import MiddlewareMixin from . import urlconf_inner -class ChangeURLconfMiddleware(object): +class ChangeURLconfMiddleware(MiddlewareMixin): def process_request(self, request): request.urlconf = urlconf_inner.__name__ -class NullChangeURLconfMiddleware(object): +class NullChangeURLconfMiddleware(MiddlewareMixin): def process_request(self, request): request.urlconf = None -class ReverseInnerInResponseMiddleware(object): +class ReverseInnerInResponseMiddleware(MiddlewareMixin): def process_response(self, *args, **kwargs): return HttpResponse(reverse('inner')) -class ReverseOuterInResponseMiddleware(object): +class ReverseOuterInResponseMiddleware(MiddlewareMixin): def process_response(self, *args, **kwargs): return HttpResponse(reverse('outer')) -class ReverseInnerInStreaming(object): +class ReverseInnerInStreaming(MiddlewareMixin): def process_view(self, *args, **kwargs): def stream(): yield reverse('inner') return StreamingHttpResponse(stream()) -class ReverseOuterInStreaming(object): +class ReverseOuterInStreaming(MiddlewareMixin): def process_view(self, *args, **kwargs): def stream(): yield reverse('outer') diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py index 4c60ecd7c6..074a573cd5 100644 --- a/tests/urlpatterns_reverse/tests.py +++ b/tests/urlpatterns_reverse/tests.py @@ -785,7 +785,7 @@ class RequestURLconfTests(SimpleTestCase): self.assertEqual(response.status_code, 404) @override_settings( - MIDDLEWARE_CLASSES=[ + MIDDLEWARE=[ '%s.ChangeURLconfMiddleware' % middleware.__name__, ] ) @@ -799,7 +799,7 @@ class RequestURLconfTests(SimpleTestCase): self.assertEqual(response.content, b'outer:,inner:/second_test/') @override_settings( - MIDDLEWARE_CLASSES=[ + MIDDLEWARE=[ '%s.NullChangeURLconfMiddleware' % middleware.__name__, ] ) @@ -817,7 +817,7 @@ class RequestURLconfTests(SimpleTestCase): self.assertEqual(response.status_code, 404) @override_settings( - MIDDLEWARE_CLASSES=[ + MIDDLEWARE=[ '%s.ChangeURLconfMiddleware' % middleware.__name__, '%s.ReverseInnerInResponseMiddleware' % middleware.__name__, ] @@ -832,7 +832,7 @@ class RequestURLconfTests(SimpleTestCase): self.assertEqual(response.content, b'/second_test/') @override_settings( - MIDDLEWARE_CLASSES=[ + MIDDLEWARE=[ '%s.ChangeURLconfMiddleware' % middleware.__name__, '%s.ReverseOuterInResponseMiddleware' % middleware.__name__, ] @@ -847,7 +847,7 @@ class RequestURLconfTests(SimpleTestCase): self.client.get('/second_test/') @override_settings( - MIDDLEWARE_CLASSES=[ + MIDDLEWARE=[ '%s.ChangeURLconfMiddleware' % middleware.__name__, '%s.ReverseInnerInStreaming' % middleware.__name__, ] @@ -862,7 +862,7 @@ class RequestURLconfTests(SimpleTestCase): self.assertEqual(b''.join(response), b'/second_test/') @override_settings( - MIDDLEWARE_CLASSES=[ + MIDDLEWARE=[ '%s.ChangeURLconfMiddleware' % middleware.__name__, '%s.ReverseOuterInStreaming' % middleware.__name__, ] -- cgit v1.3