From 1c74e6cfb96556574b3746e7804dd3fdcd40d6ee Mon Sep 17 00:00:00 2001 From: Kaitlyn Crawford Date: Tue, 18 Dec 2018 13:32:02 +0200 Subject: [PATCH] Update Wagtail imports to work for 2.0 --- .../migrations/0003_homepage_text_content.py | 6 ++--- sandbox/sandbox/apps/home/models.py | 8 +++--- sandbox/sandbox/apps/search/views.py | 4 +-- sandbox/sandbox/settings.py | 26 +++++++++---------- sandbox/sandbox/urls.py | 6 ++--- src/wagtail_personalisation/blocks.py | 2 +- src/wagtail_personalisation/forms.py | 2 +- src/wagtail_personalisation/models.py | 4 +-- src/wagtail_personalisation/rules.py | 2 +- src/wagtail_personalisation/views.py | 2 +- src/wagtail_personalisation/wagtail_hooks.py | 16 ++++++------ tests/conftest.py | 2 +- tests/factories/site.py | 2 +- tests/settings.py | 16 ++++++------ tests/site/pages/migrations/0001_initial.py | 4 +-- .../site/pages/migrations/0002_regularpage.py | 4 +-- tests/site/pages/models.py | 6 ++--- tests/site/urls.py | 6 ++--- 18 files changed, 59 insertions(+), 59 deletions(-) diff --git a/sandbox/sandbox/apps/home/migrations/0003_homepage_text_content.py b/sandbox/sandbox/apps/home/migrations/0003_homepage_text_content.py index d4108b9..adb5502 100644 --- a/sandbox/sandbox/apps/home/migrations/0003_homepage_text_content.py +++ b/sandbox/sandbox/apps/home/migrations/0003_homepage_text_content.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import migrations -import wagtail.wagtailcore.fields +import wagtail.core.fields import wagtail_personalisation @@ -17,14 +17,14 @@ class Migration(migrations.Migration): migrations.AddField( model_name='homepage', name='intro', - field=wagtail.wagtailcore.fields.RichTextField( + field=wagtail.core.fields.RichTextField( default='

Thank you for trying Wagxperience!

'), preserve_default=False, ), migrations.AddField( model_name='homepage', name='body', - field=wagtail.wagtailcore.fields.StreamField((('personalisable_paragraph', wagtail.wagtailcore.blocks.StructBlock((('segment', wagtail.wagtailcore.blocks.ChoiceBlock(choices=wagtail_personalisation.blocks.list_segment_choices, help_text='Only show this content block for users in this segment', label='Personalisation segment', required=False)), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock())), icon='pilcrow')),), default=''), + field=wagtail.core.fields.StreamField((('personalisable_paragraph', wagtail.core.blocks.StructBlock((('segment', wagtail.core.blocks.ChoiceBlock(choices=wagtail_personalisation.blocks.list_segment_choices, help_text='Only show this content block for users in this segment', label='Personalisation segment', required=False)), ('paragraph', wagtail.core.blocks.RichTextBlock())), icon='pilcrow')),), default=''), preserve_default=False, ), ] diff --git a/sandbox/sandbox/apps/home/models.py b/sandbox/sandbox/apps/home/models.py index 0d409fe..fbd05b0 100644 --- a/sandbox/sandbox/apps/home/models.py +++ b/sandbox/sandbox/apps/home/models.py @@ -1,9 +1,9 @@ from __future__ import absolute_import, unicode_literals -from wagtail.wagtailadmin.edit_handlers import RichTextFieldPanel, StreamFieldPanel -from wagtail.wagtailcore import blocks -from wagtail.wagtailcore.fields import RichTextField, StreamField -from wagtail.wagtailcore.models import Page +from wagtail.admin.edit_handlers import RichTextFieldPanel, StreamFieldPanel +from wagtail.core import blocks +from wagtail.core.fields import RichTextField, StreamField +from wagtail.core.models import Page from wagtail_personalisation.models import PersonalisablePageMixin from wagtail_personalisation.blocks import PersonalisedStructBlock diff --git a/sandbox/sandbox/apps/search/views.py b/sandbox/sandbox/apps/search/views.py index e17a1e9..78b1631 100644 --- a/sandbox/sandbox/apps/search/views.py +++ b/sandbox/sandbox/apps/search/views.py @@ -3,8 +3,8 @@ from __future__ import absolute_import, unicode_literals from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator from django.shortcuts import render -from wagtail.wagtailcore.models import Page -from wagtail.wagtailsearch.models import Query +from wagtail.core.models import Page +from wagtail.search.models import Query def search(request): diff --git a/sandbox/sandbox/settings.py b/sandbox/sandbox/settings.py index ac25145..daebf13 100644 --- a/sandbox/sandbox/settings.py +++ b/sandbox/sandbox/settings.py @@ -33,17 +33,17 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' # Application definition INSTALLED_APPS = [ - 'wagtail.wagtailforms', - 'wagtail.wagtailredirects', - 'wagtail.wagtailembeds', - 'wagtail.wagtailsites', - 'wagtail.wagtailusers', - 'wagtail.wagtailsnippets', - 'wagtail.wagtaildocs', - 'wagtail.wagtailimages', - 'wagtail.wagtailsearch', - 'wagtail.wagtailadmin', - 'wagtail.wagtailcore', + 'wagtail.contrib.forms', + 'wagtail.contrib.redirects', + 'wagtail.embeds', + 'wagtail.sites', + 'wagtail.users', + 'wagtail.snippets', + 'wagtail.documents', + 'wagtail.images', + 'wagtail.search', + 'wagtail.admin', + 'wagtail.core', 'wagtail.contrib.modeladmin', 'wagtailfontawesome', @@ -77,8 +77,8 @@ MIDDLEWARE = [ 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware', - 'wagtail.wagtailcore.middleware.SiteMiddleware', - 'wagtail.wagtailredirects.middleware.RedirectMiddleware', + 'wagtail.core.middleware.SiteMiddleware', + 'wagtail.contrib.redirects.middleware.RedirectMiddleware', ] ROOT_URLCONF = 'sandbox.urls' diff --git a/sandbox/sandbox/urls.py b/sandbox/sandbox/urls.py index 383a8e6..c63a67b 100644 --- a/sandbox/sandbox/urls.py +++ b/sandbox/sandbox/urls.py @@ -4,9 +4,9 @@ import debug_toolbar from django.conf import settings from django.conf.urls import include, url from django.contrib import admin -from wagtail.wagtailadmin import urls as wagtailadmin_urls -from wagtail.wagtailcore import urls as wagtail_urls -from wagtail.wagtaildocs import urls as wagtaildocs_urls +from wagtail.admin import urls as wagtailadmin_urls +from wagtail.core import urls as wagtail_urls +from wagtail.documents import urls as wagtaildocs_urls from sandbox.apps.search import views as search_views diff --git a/src/wagtail_personalisation/blocks.py b/src/wagtail_personalisation/blocks.py index fd6d35d..3d74f93 100644 --- a/src/wagtail_personalisation/blocks.py +++ b/src/wagtail_personalisation/blocks.py @@ -1,7 +1,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailcore import blocks +from wagtail.core import blocks from wagtail_personalisation.adapters import get_segment_adapter from wagtail_personalisation.models import Segment diff --git a/src/wagtail_personalisation/forms.py b/src/wagtail_personalisation/forms.py index 02555eb..c0fbc08 100644 --- a/src/wagtail_personalisation/forms.py +++ b/src/wagtail_personalisation/forms.py @@ -10,7 +10,7 @@ from django.contrib.staticfiles.templatetags.staticfiles import static from django.test.client import RequestFactory from django.utils.lru_cache import lru_cache from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.forms import WagtailAdminModelForm +from wagtail.admin.forms import WagtailAdminModelForm SessionStore = import_module(settings.SESSION_ENGINE).SessionStore diff --git a/src/wagtail_personalisation/models.py b/src/wagtail_personalisation/models.py index 7a4063e..ae3ed4e 100644 --- a/src/wagtail_personalisation/models.py +++ b/src/wagtail_personalisation/models.py @@ -11,9 +11,9 @@ from django.utils.functional import cached_property from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ from modelcluster.models import ClusterableModel -from wagtail.wagtailadmin.edit_handlers import ( +from wagtail.admin.edit_handlers import ( FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel) -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from wagtail_personalisation.rules import AbstractBaseRule from wagtail_personalisation.utils import count_active_days diff --git a/src/wagtail_personalisation/rules.py b/src/wagtail_personalisation/rules.py index 4fa82f7..c012cd0 100644 --- a/src/wagtail_personalisation/rules.py +++ b/src/wagtail_personalisation/rules.py @@ -15,7 +15,7 @@ from django.utils.translation import ugettext_lazy as _ from django.test.client import RequestFactory from modelcluster.fields import ParentalKey from user_agents import parse -from wagtail.wagtailadmin.edit_handlers import ( +from wagtail.admin.edit_handlers import ( FieldPanel, FieldRowPanel, PageChooserPanel) SessionStore = import_module(settings.SESSION_ENGINE).SessionStore diff --git a/src/wagtail_personalisation/views.py b/src/wagtail_personalisation/views.py index 8227367..1a53591 100644 --- a/src/wagtail_personalisation/views.py +++ b/src/wagtail_personalisation/views.py @@ -8,7 +8,7 @@ from django.shortcuts import get_object_or_404 from django.utils.translation import ugettext_lazy as _ from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register from wagtail.contrib.modeladmin.views import IndexView -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from wagtail_personalisation.models import Segment diff --git a/src/wagtail_personalisation/wagtail_hooks.py b/src/wagtail_personalisation/wagtail_hooks.py index 4f5a31d..6c91c99 100644 --- a/src/wagtail_personalisation/wagtail_hooks.py +++ b/src/wagtail_personalisation/wagtail_hooks.py @@ -7,10 +7,10 @@ from django.core.urlresolvers import reverse from django.template.defaultfilters import pluralize from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailadmin.site_summary import PagesSummaryItem, SummaryItem -from wagtail.wagtailadmin.widgets import Button, ButtonWithDropdownFromHook -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Page +from wagtail.admin.site_summary import PagesSummaryItem, SummaryItem +from wagtail.admin.widgets import Button, ButtonWithDropdownFromHook +from wagtail.core import hooks +from wagtail.core.models import Page from wagtail_personalisation import admin_urls, models, utils from wagtail_personalisation.adapters import get_segment_adapter @@ -35,7 +35,7 @@ def set_visit_count(page, request, serve_args, serve_kwargs): to a segment. :param page: The page being served - :type page: wagtail.wagtailcore.models.Page + :type page: wagtail.core.models.Page :param request: The http request :type request: django.http.HttpRequest @@ -49,7 +49,7 @@ def segment_user(page, request, serve_args, serve_kwargs): """Apply a segment to a visitor before serving the page. :param page: The page being served - :type page: wagtail.wagtailcore.models.Page + :type page: wagtail.core.models.Page :param request: The http request :type request: django.http.HttpRequest @@ -63,12 +63,12 @@ def serve_variant(page, request, serve_args, serve_kwargs): """Apply a segment to a visitor before serving the page. :param page: The page being served - :type page: wagtail.wagtailcore.models.Page + :type page: wagtail.core.models.Page :param request: The http request :type request: django.http.HttpRequest :returns: A variant if one is available for the visitor's segment, otherwise the original page - :rtype: wagtail.wagtailcore.models.Page + :rtype: wagtail.core.models.Page """ user_segments = [] diff --git a/tests/conftest.py b/tests/conftest.py index ee60a76..77e07e7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -9,7 +9,7 @@ pytest_plugins = [ @pytest.fixture(scope='session') def django_db_setup(django_db_setup, django_db_blocker): - from wagtail.wagtailcore.models import Page, Site + from wagtail.core.models import Page, Site with django_db_blocker.unblock(): # Remove some initial data that is brought by the tests.site module diff --git a/tests/factories/site.py b/tests/factories/site.py index cf8f65a..631963b 100644 --- a/tests/factories/site.py +++ b/tests/factories/site.py @@ -1,5 +1,5 @@ import factory -from wagtail.wagtailcore.models import Site +from wagtail.core.models import Site from tests.factories.page import ContentPageFactory diff --git a/tests/settings.py b/tests/settings.py index ac0f1c0..e2f174e 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -66,7 +66,7 @@ def get_middleware_settings(): 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'wagtail.wagtailcore.middleware.SiteMiddleware', + 'wagtail.core.middleware.SiteMiddleware', ) @@ -80,13 +80,13 @@ INSTALLED_APPS = ( 'wagtail_personalisation', 'wagtail.contrib.modeladmin', - 'wagtail.wagtailsearch', - 'wagtail.wagtailsites', - 'wagtail.wagtailusers', - 'wagtail.wagtailimages', - 'wagtail.wagtaildocs', - 'wagtail.wagtailadmin', - 'wagtail.wagtailcore', + 'wagtail.search', + 'wagtail.sites', + 'wagtail.users', + 'wagtail.images', + 'wagtail.documents', + 'wagtail.admin', + 'wagtail.core', 'taggit', diff --git a/tests/site/pages/migrations/0001_initial.py b/tests/site/pages/migrations/0001_initial.py index b24911e..bbd7542 100644 --- a/tests/site/pages/migrations/0001_initial.py +++ b/tests/site/pages/migrations/0001_initial.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import django.db.models.deletion -import wagtail.wagtailcore.fields +import wagtail.core.fields from django.db import migrations, models import wagtail_personalisation.models @@ -23,7 +23,7 @@ class Migration(migrations.Migration): fields=[ ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), # noqa: E501 ('subtitle', models.CharField(blank=True, default='', max_length=255)), - ('body', wagtail.wagtailcore.fields.RichTextField(blank=True, default='')), + ('body', wagtail.core.fields.RichTextField(blank=True, default='')), ], options={ 'abstract': False, diff --git a/tests/site/pages/migrations/0002_regularpage.py b/tests/site/pages/migrations/0002_regularpage.py index 09be0f8..d196a05 100644 --- a/tests/site/pages/migrations/0002_regularpage.py +++ b/tests/site/pages/migrations/0002_regularpage.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import django.db.models.deletion -import wagtail.wagtailcore.fields +import wagtail.core.fields from django.db import migrations, models @@ -20,7 +20,7 @@ class Migration(migrations.Migration): fields=[ ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), # noqa: E501 ('subtitle', models.CharField(blank=True, default='', max_length=255)), - ('body', wagtail.wagtailcore.fields.RichTextField(blank=True, default='')), + ('body', wagtail.core.fields.RichTextField(blank=True, default='')), ], options={ 'abstract': False, diff --git a/tests/site/pages/models.py b/tests/site/pages/models.py index 1ee6603..28f1702 100644 --- a/tests/site/pages/models.py +++ b/tests/site/pages/models.py @@ -1,9 +1,9 @@ from __future__ import absolute_import, unicode_literals from django.db import models -from wagtail.wagtailadmin.edit_handlers import FieldPanel -from wagtail.wagtailcore.fields import RichTextField -from wagtail.wagtailcore.models import Page +from wagtail.admin.edit_handlers import FieldPanel +from wagtail.core.fields import RichTextField +from wagtail.core.models import Page from wagtail_personalisation.models import PersonalisablePageMixin diff --git a/tests/site/urls.py b/tests/site/urls.py index cb109ba..a47bb5a 100644 --- a/tests/site/urls.py +++ b/tests/site/urls.py @@ -2,9 +2,9 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import include, url from django.contrib import admin -from wagtail.wagtailadmin import urls as wagtailadmin_urls -from wagtail.wagtailcore import urls as wagtail_urls -from wagtail.wagtaildocs import urls as wagtaildocs_urls +from wagtail.admin import urls as wagtailadmin_urls +from wagtail.core import urls as wagtail_urls +from wagtail.documents import urls as wagtaildocs_urls urlpatterns = [ url(r'^django-admin/', include(admin.site.urls)),