From 7eaac7015469fda18a662d898a109d4d6eae143b Mon Sep 17 00:00:00 2001 From: "nick.moreton" Date: Thu, 30 Jun 2022 07:24:58 +0100 Subject: [PATCH] avoid lint errors --- src/wagtail_personalisation/forms.py | 2 +- src/wagtail_personalisation/rules.py | 4 ++-- src/wagtail_personalisation/wagtail_hooks.py | 2 +- tests/factories/page.py | 1 + tests/unit/test_utils.py | 8 ++++---- tests/unit/test_views.py | 6 +++--- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/wagtail_personalisation/forms.py b/src/wagtail_personalisation/forms.py index 65e9ed8..d5a065f 100644 --- a/src/wagtail_personalisation/forms.py +++ b/src/wagtail_personalisation/forms.py @@ -1,5 +1,5 @@ -from datetime import datetime import functools +from datetime import datetime from importlib import import_module from django.conf import settings diff --git a/src/wagtail_personalisation/rules.py b/src/wagtail_personalisation/rules.py index b4a1729..5aee4b8 100644 --- a/src/wagtail_personalisation/rules.py +++ b/src/wagtail_personalisation/rules.py @@ -255,7 +255,7 @@ class VisitCountRule(AbstractBaseRule): def test_user(self, request, user=None): # Local import for cyclic import from wagtail_personalisation.adapters import ( - get_segment_adapter, SessionSegmentsAdapter, SEGMENT_ADAPTER_CLASS) + SEGMENT_ADAPTER_CLASS, SessionSegmentsAdapter, get_segment_adapter) # Django formsets don't honour 'required' fields so check rule is valid try: @@ -312,7 +312,7 @@ class VisitCountRule(AbstractBaseRule): def get_user_info_string(self, user): # Local import for cyclic import from wagtail_personalisation.adapters import ( - get_segment_adapter, SessionSegmentsAdapter, SEGMENT_ADAPTER_CLASS) + SEGMENT_ADAPTER_CLASS, SessionSegmentsAdapter, get_segment_adapter) # Create a fake request so we can use the adapter request = RequestFactory().get('/') diff --git a/src/wagtail_personalisation/wagtail_hooks.py b/src/wagtail_personalisation/wagtail_hooks.py index 3c440b2..aae5639 100644 --- a/src/wagtail_personalisation/wagtail_hooks.py +++ b/src/wagtail_personalisation/wagtail_hooks.py @@ -304,7 +304,7 @@ def add_personalisation_summary_panels(request, items): def delete_related_variants(request, page): if ( not isinstance(page, models.PersonalisablePageMixin) - or not page.personalisation_metadata.is_canonical + or not page.personalisation_metadata.is_canonical # noqa ): return # Get a list of related personalisation metadata for all the related diff --git a/tests/factories/page.py b/tests/factories/page.py index 177ad36..4731f2e 100644 --- a/tests/factories/page.py +++ b/tests/factories/page.py @@ -18,6 +18,7 @@ try: except ImportError: pass + class ContentPageFactory(PageFactory): parent = None title = 'Test page' diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 42c0d0f..7b2483a 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -2,16 +2,16 @@ import pytest from django.test import override_settings from wagtail.core.models import Page as WagtailPage -from tests.factories.page import (ContentPageFactory, PersonalisablePageMetadataFactory) +from tests.factories.page import ( + ContentPageFactory, PersonalisablePageMetadataFactory) from wagtail_personalisation.utils import ( can_delete_pages, exclude_variants, get_client_ip, impersonate_other_page) - locale_factory = False try: - from tests.factories.page import LocaleFactory - locale_factory = True + from tests.factories.page import LocaleFactory # noqa + locale_factory = True # noqa except ImportError: pass diff --git a/tests/unit/test_views.py b/tests/unit/test_views.py index f70116b..bd8d302 100644 --- a/tests/unit/test_views.py +++ b/tests/unit/test_views.py @@ -74,7 +74,7 @@ def test_segment_delete_view_delete_instance(rf, segmented_page, user): assert variants_metadata # Delete the segment via the method on the view. - request = rf.get('/'.format(segment.pk)) + request = rf.get('/'.format(segment.pk)) # noqa request.user = user view = SegmentModelDeleteView( instance_pk=str(segment.pk), @@ -98,13 +98,13 @@ def test_segment_delete_view_delete_instance(rf, segmented_page, user): @pytest.mark.django_db def test_segment_delete_view_raises_permission_denied(rf, segmented_page, user): segment = segmented_page.personalisation_metadata.segment - request = rf.get('/'.format(segment.pk)) + request = rf.get('/'.format(segment.pk)) # noqa request.user = user view = SegmentModelDeleteView( instance_pk=str(segment.pk), model_admin=SegmentModelAdmin() ) view.request = request - message = 'User have no permission to delete variant page objects.' + message = 'User have no permission to delete variant page objects.' # noqa with pytest.raises(PermissionDenied): view.delete_instance()