From be8cd8f8a91d82cffe95d74671029489da1da692 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 23 Jan 2020 12:09:35 +0000 Subject: [PATCH] Remove dummy_request from Page --- wagtail/core/models.py | 25 ------------------------- wagtail/core/tests/test_page_model.py | 4 ++-- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/wagtail/core/models.py b/wagtail/core/models.py index cf6d16d22..be8cbf443 100644 --- a/wagtail/core/models.py +++ b/wagtail/core/models.py @@ -3,7 +3,6 @@ import logging from collections import defaultdict from io import StringIO from urllib.parse import urlparse -from warnings import warn from django.conf import settings from django.contrib.auth.models import Group, Permission @@ -33,7 +32,6 @@ from wagtail.core.sites import get_site_for_hostname from wagtail.core.url_routing import RouteResult from wagtail.core.utils import WAGTAIL_APPEND_SLASH, camelcase_to_underscore, resolve_model_string from wagtail.search import index -from wagtail.utils.deprecation import RemovedInWagtail29Warning logger = logging.getLogger('wagtail.core') @@ -1336,29 +1334,6 @@ class Page(AbstractPage, index.Indexed, ClusterableModel, metaclass=PageBase): """ return self.full_url - def dummy_request(self, original_request=None, **meta): - warn( - "Page.dummy_request is deprecated. Use Page.make_preview_request instead", - category=RemovedInWagtail29Warning - ) - - dummy_values = self._get_dummy_headers(original_request) - - # Add additional custom metadata sent by the caller. - dummy_values.update(**meta) - - request = WSGIRequest(dummy_values) - - # Add a flag to let middleware know that this is a dummy request. - request.is_dummy = True - - # Apply middleware to the request - handler = BaseHandler() - handler.load_middleware() - handler._middleware_chain(request) - - return request - DEFAULT_PREVIEW_MODES = [('', _('Default'))] @property diff --git a/wagtail/core/tests/test_page_model.py b/wagtail/core/tests/test_page_model.py index 28c9c9db1..539130d27 100644 --- a/wagtail/core/tests/test_page_model.py +++ b/wagtail/core/tests/test_page_model.py @@ -1571,12 +1571,12 @@ class TestMakePreviewRequest(TestCase): request = response.context_data['request'] # in the absence of an actual Site record where we can access this page, - # dummy_request should still provide a hostname that Django's host header + # make_preview_request should still provide a hostname that Django's host header # validation won't reject self.assertEqual(request.META['HTTP_HOST'], 'production.example.com') @override_settings(ALLOWED_HOSTS=['*']) - def test_dummy_request_for_inaccessible_page_with_wildcard_allowed_hosts(self): + def test_make_preview_request_for_inaccessible_page_with_wildcard_allowed_hosts(self): root_page = Page.objects.get(url_path='/') response = root_page.make_preview_request() self.assertEqual(response.status_code, 200)