going after wagtail4

Author: rgs258

example/migrations/0001_initial.py

@@ -2,8 +2,8 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import wagtail.core.blocks
-import wagtail.core.fields
+import wagtail.blocks
+import wagtail.fields
 import wagtailstreamforms.blocks
 
 
@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
             name='BasicPage',
             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')),
-                ('body', wagtail.core.fields.StreamField((('rich_text', wagtail.core.blocks.RichTextBlock()), ('form', wagtail.core.blocks.StructBlock((('form', wagtailstreamforms.blocks.FormChooserBlock()), ('form_action', wagtail.core.blocks.CharBlock(help_text='The form post action. "" or "." for the current page or a url', required=False)), ('form_reference', wagtailstreamforms.blocks.InfoBlock(help_text='This form will be given a unique reference once saved', required=False)))))))),
+                ('body', wagtail.fields.StreamField((('rich_text', wagtail.blocks.RichTextBlock()), ('form', wagtail.blocks.StructBlock((('form', wagtailstreamforms.blocks.FormChooserBlock()), ('form_action', wagtail.blocks.CharBlock(help_text='The form post action. "" or "." for the current page or a url', required=False)), ('form_reference', wagtailstreamforms.blocks.InfoBlock(help_text='This form will be given a unique reference once saved', required=False)))))))),
             ],
             options={
                 'abstract': False,

example/models.py

@@ -1,9 +1,9 @@
 from django.db import models
 
-from wagtail.admin.edit_handlers import StreamFieldPanel
-from wagtail.core import blocks
-from wagtail.core.fields import StreamField
-from wagtail.core.models import Page
+from wagtail.admin.panels import StreamFieldPanel
+from wagtail import blocks
+from wagtail.fields import StreamField
+from wagtail.models import Page
 from wagtailstreamforms.blocks import WagtailFormBlock
 from wagtailstreamforms.models.abstract import AbstractFormSetting
 

example/settings.py

@@ -27,7 +27,7 @@
     'django.contrib.staticfiles',
 
     # wagtail
-    'wagtail.core',
+    'wagtail',
     'wagtail.admin',
     'wagtail.documents',
     'wagtail.snippets',

example/urls.py

@@ -4,7 +4,7 @@
 from django.contrib import admin
 
 from wagtail.admin import urls as wagtailadmin_urls
-from wagtail.core import urls as wagtail_urls
+from wagtail import urls as wagtail_urls
 from wagtail.documents import urls as wagtaildocs_urls
 
 

example/wagtailstreamforms_fields.py

@@ -2,7 +2,7 @@
 from django.contrib.auth.models import User
 
 from captcha.fields import ReCaptchaField
-from wagtail.core import blocks
+from wagtail import blocks
 from wagtailstreamforms.fields import BaseField, register
 
 

setup.py

@@ -18,7 +18,7 @@
 
 
 install_requires = [
-    "wagtail>=2,<=3.0.3",
+    "wagtail>=2,<=4.1",
     "Unidecode>=0.04.14,<2.0",
 ]
 

tests/hooks/test_process_form.py

@@ -2,7 +2,7 @@
 from django.test import override_settings
 from django.test.client import Client
 from mock import patch
-from wagtail.core.models import Page
+from wagtail.models import Page
 
 from wagtailstreamforms.models import Form
 from wagtailstreamforms.wagtail_hooks import process_form

tests/models/test_form.py

@@ -2,7 +2,7 @@
 from django.db import models
 from django.test import override_settings
 from django.utils.translation import gettext_lazy as _
-from wagtail.core.models import Page
+from wagtail.models import Page
 
 from wagtailstreamforms.conf import get_setting
 from wagtailstreamforms.fields import HookSelectField

tests/settings.py

@@ -14,7 +14,7 @@
     "django.contrib.messages",
     "django.contrib.staticfiles",
     # wagtail
-    "wagtail.core",
+    "wagtail",
     "wagtail.admin",
     "wagtail.documents",
     "wagtail.snippets",

tests/urls.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 from django.urls import include, re_path
 from wagtail.admin import urls as wagtailadmin_urls
-from wagtail.core import urls as wagtail_urls
+from wagtail import urls as wagtail_urls
 
 urlpatterns = [
     re_path(r"^admin/", admin.site.urls),