fix linting

wagtail/admin/tests/test_pages_views.py

@@ -5208,6 +5208,7 @@ class TestValidationErrorMessages(TestCase, WagtailTestUtils):
         # Error on title shown in the header message
         self.assertContains(response, "<li>Title: This field is required.</li>", count=1)
 
+
 @override_settings(ALLOWED_HOSTS=['*'])
 class TestDraftAccess(TestCase, WagtailTestUtils):
     """Tests for the draft view access restrictions."""
@@ -5268,6 +5269,7 @@ class TestDraftAccess(TestCase, WagtailTestUtils):
         # User can view
         self.assertEqual(response.status_code, 200)
 
+
 @override_settings(ALLOWED_HOSTS=['*'])
 class TestPreview(TestCase, WagtailTestUtils):
     fixtures = ['test.json']

wagtail/api/v2/filters.py

@@ -4,7 +4,7 @@ from rest_framework.filters import BaseFilterBackend
 from taggit.managers import TaggableManager
 
 from wagtail.core import hooks
-from wagtail.core.models import Page, UserPagePermissionsProxy, Site
+from wagtail.core.models import Page, Site, UserPagePermissionsProxy
 from wagtail.search.backends import get_search_backend
 from wagtail.search.backends.base import FilterFieldError, OrderByFieldError
 

wagtail/contrib/redirects/middleware.py

@@ -37,11 +37,6 @@ class RedirectMiddleware(MiddlewareMixin):
         if response.status_code != 404:
             return response
 
-        # If a middleware before `SiteMiddleware` returned a response the
-        # `site` attribute was never set, ref #2120
-        #if not hasattr(request, 'site'):
-        #    return response
-
         # Get the path
         path = models.Redirect.normalise_path(request.get_full_path())
 

wagtail/contrib/settings/tests/test_templates.py

@@ -30,7 +30,7 @@ class TemplateTestCase(TestCase, WagtailTestUtils):
     def get_request(self, site=None):
         if site is None:
             site = self.default_site
-        #request = self.client.get('/test/', HTTP_HOST=site.hostname)
+
         request = HttpRequest()
         request.META['HTTP_HOST'] = site.hostname
         request.META['SERVER_PORT'] = site.port
@@ -177,7 +177,6 @@ class TestSettingsJinja(TemplateTestCase):
             else:
                 site = Site.objects.get(is_default_site=True)
 
-            #request = self.client.get('/test/', HTTP_HOST=site.hostname)
             request = HttpRequest()
             request.META['HTTP_HOST'] = site.hostname
             request.META['SERVER_PORT'] = site.port

wagtail/core/middleware.py

@@ -1,8 +1,7 @@
-from django.utils.deprecation import MiddlewareMixin
-
-from wagtail.core.models import Site
-
 import warnings
+
+from django.utils.deprecation import MiddlewareMixin
+from wagtail.core.models import Site
 from wagtail.utils.deprecation import RemovedInWagtail28Warning
 
 

wagtail/core/models.py

@@ -19,7 +19,7 @@ from django.http import Http404
 from django.template.response import TemplateResponse
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.functional import cached_property, lazy
+from django.utils.functional import cached_property
 from django.utils.text import capfirst, slugify
 from django.utils.translation import ugettext_lazy as _
 from modelcluster.models import (

wagtail/core/tests/test_jinja2.py

@@ -21,8 +21,6 @@ class TestCoreGlobalsAndFilters(TestCase):
         if request_context:
             site = Site.objects.get(is_default_site=True)
             request = self.client.get('/test/', HTTP_HOST=site.hostname)
-            #request.META['HTTP_HOST'] = site.hostname
-            #request.META['SERVER_PORT'] = site.port
             context['request'] = request
 
         template = self.engine.from_string(string)