update module paths

Mng-dev-ai · Mng-dev-ai · commit e7b082ccfe81 · 2023-03-16T20:53:20.000+02:00
diff --git a/build_test/models/home_page.py b/build_test/models/home_page.py
@@ -1,4 +1,4 @@
-from wagtail.core.models import Page
+from wagtail.models import Page
 
 
 class HomePage(Page):
diff --git a/build_test/settings/dev.py b/build_test/settings/dev.py
@@ -29,7 +29,7 @@
     'wagtail.images',
     'wagtail.search',
     'wagtail.admin',
-    'wagtail.core',
+    'wagtail',
     'wagtail.contrib.modeladmin',
     'wagtail.contrib.settings',
     'wagtail.contrib.routable_page',
diff --git a/build_test/urls.py b/build_test/urls.py
@@ -2,7 +2,7 @@
 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
 from wagtail.documents import urls as wagtaildocs_urls
 
 urlpatterns = []
diff --git a/wagtail_advanced_form_builder/blocks/base_static_block.py b/wagtail_advanced_form_builder/blocks/base_static_block.py
@@ -1,6 +1,6 @@
 from django.template.loader import render_to_string
 
-from wagtail.core import blocks
+from wagtail import blocks
 
 
 class BaseStaticBlock(blocks.StaticBlock):
diff --git a/wagtail_advanced_form_builder/blocks/fields/base_field_block.py b/wagtail_advanced_form_builder/blocks/fields/base_field_block.py
@@ -1,8 +1,8 @@
 from django import forms
 from django.templatetags.static import static
 
-from wagtail.core import blocks
-from wagtail.core.blocks import RichTextBlock
+from wagtail import blocks
+from wagtail.blocks import RichTextBlock
 
 from .conditional_block import ConditionalBlock
 
diff --git a/wagtail_advanced_form_builder/blocks/fields/blank_condition_block.py b/wagtail_advanced_form_builder/blocks/fields/blank_condition_block.py
@@ -1,6 +1,6 @@
 import wagtail_advanced_form_builder.constants as consts
 
-from wagtail.core import blocks
+from wagtail import blocks
 
 from .condition_block import ConditionBlock
 
diff --git a/wagtail_advanced_form_builder/blocks/fields/checkbox_field_block.py b/wagtail_advanced_form_builder/blocks/fields/checkbox_field_block.py
@@ -1,4 +1,4 @@
-from wagtail.core import blocks
+from wagtail import blocks
 
 from .base_field_block import BaseFieldBlock
 
diff --git a/wagtail_advanced_form_builder/blocks/fields/checkboxes_field_block.py b/wagtail_advanced_form_builder/blocks/fields/checkboxes_field_block.py
@@ -1,4 +1,4 @@
-from wagtail.core import blocks
+from wagtail import blocks
 
 from .base_field_block import BaseFieldBlock
 
diff --git a/wagtail_advanced_form_builder/blocks/fields/condition_block.py b/wagtail_advanced_form_builder/blocks/fields/condition_block.py
@@ -1,6 +1,6 @@
 import wagtail_advanced_form_builder.constants as consts
 
-from wagtail.core import blocks
+from wagtail import blocks
 
 
 class ConditionBlock(blocks.StructBlock):
diff --git a/wagtail_advanced_form_builder/blocks/fields/conditional_block.py b/wagtail_advanced_form_builder/blocks/fields/conditional_block.py
@@ -1,6 +1,6 @@
 import wagtail_advanced_form_builder.constants as consts
 
-from wagtail.core import blocks
+from wagtail import blocks
 
 from .condition_block import ConditionBlock
 from .blank_condition_block import BlankConditionBlock
diff --git a/wagtail_advanced_form_builder/blocks/fields/dropdown_field_block.py b/wagtail_advanced_form_builder/blocks/fields/dropdown_field_block.py
@@ -1,4 +1,4 @@
-from wagtail.core import blocks
+from wagtail import blocks
 
 from .base_field_block import BaseFieldBlock
 
diff --git a/wagtail_advanced_form_builder/blocks/fields/hidden_field_block.py b/wagtail_advanced_form_builder/blocks/fields/hidden_field_block.py
@@ -1,4 +1,4 @@
-from wagtail.core import blocks
+from wagtail import blocks
 
 from .base_field_block import BaseFieldBlock
 
diff --git a/wagtail_advanced_form_builder/blocks/fields/html_field_block.py b/wagtail_advanced_form_builder/blocks/fields/html_field_block.py
@@ -1,5 +1,5 @@
-from wagtail.core import blocks
-from wagtail.core.blocks import RichTextBlock
+from wagtail import blocks
+from wagtail.blocks import RichTextBlock
 
 from .base_field_block import BaseFieldBlock
 
diff --git a/wagtail_advanced_form_builder/blocks/fields/multiselect_field_block.py b/wagtail_advanced_form_builder/blocks/fields/multiselect_field_block.py
@@ -1,4 +1,4 @@
-from wagtail.core import blocks
+from wagtail import blocks
 
 from .base_field_block import BaseFieldBlock
 
diff --git a/wagtail_advanced_form_builder/blocks/fields/radio_field_block.py b/wagtail_advanced_form_builder/blocks/fields/radio_field_block.py
@@ -1,4 +1,4 @@
-from wagtail.core import blocks
+from wagtail import blocks
 
 from .base_field_block import BaseFieldBlock
 
diff --git a/wagtail_advanced_form_builder/migrations/0001_initial.py b/wagtail_advanced_form_builder/migrations/0001_initial.py
diff --git a/wagtail_advanced_form_builder/migrations/0002_auto_20201116_2241.py b/wagtail_advanced_form_builder/migrations/0002_auto_20201116_2241.py
diff --git a/wagtail_advanced_form_builder/models/abstract_advanced_email_form.py b/wagtail_advanced_form_builder/models/abstract_advanced_email_form.py
@@ -1,6 +1,6 @@
 from django.utils.translation import gettext_lazy as _
 
-from wagtail.admin.edit_handlers import MultiFieldPanel, FieldRowPanel, FieldPanel
+from wagtail.admin.panels import MultiFieldPanel, FieldRowPanel, FieldPanel
 from wagtail.contrib.forms.models import AbstractEmailForm
 
 from .abstract_advanced_form_mixin import AbstractAdvancedFormMixin
diff --git a/wagtail_advanced_form_builder/models/abstract_advanced_form_field.py b/wagtail_advanced_form_builder/models/abstract_advanced_form_field.py
@@ -4,7 +4,7 @@
 from modelcluster.models import ClusterableModel
 
 from wagtail.contrib.forms.models import AbstractFormField
-from wagtail.core.fields import RichTextField
+from wagtail.fields import RichTextField
 
 import wagtail_advanced_form_builder.constants as consts
 from wagtail_advanced_form_builder.utils import clean_form_field_name
diff --git a/wagtail_advanced_form_builder/models/abstract_advanced_form_mixin.py b/wagtail_advanced_form_builder/models/abstract_advanced_form_mixin.py
@@ -5,9 +5,9 @@
 from django.shortcuts import render
 from django.utils.translation import gettext_lazy as _
 
-from wagtail.admin.edit_handlers import FieldPanel, MultiFieldPanel
-from wagtail.core.fields import RichTextField, StreamField
-from wagtail.core.rich_text import RichText
+from wagtail.admin.panels import FieldPanel, MultiFieldPanel
+from wagtail.fields import RichTextField, StreamField
+from wagtail.rich_text import RichText
 
 from wagtail_advanced_form_builder.blocks.fields import SingleLineFieldBlock
 from wagtail_advanced_form_builder.forms import AdvancedFormBuilder
diff --git a/wagtail_advanced_form_builder/models/email_form_page.py b/wagtail_advanced_form_builder/models/email_form_page.py
@@ -1,4 +1,4 @@
-from wagtail.core.models import Page
+from wagtail.models import Page
 
 from .abstract_advanced_email_form import AbstractAdvancedEmailForm
 
diff --git a/wagtail_advanced_form_builder/models/form_page.py b/wagtail_advanced_form_builder/models/form_page.py
@@ -1,4 +1,4 @@
-from wagtail.core.models import Page
+from wagtail.models import Page
 
 from wagtail_advanced_form_builder.models.abstract_advanced_form import AbstractAdvancedForm
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from wagtail.core.models import Page`
	`1`	`+from wagtail.models import Page`
`2`	`2`
`3`	`3`
`4`	`4`	`class HomePage(Page):`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from wagtail.core import blocks`
	`1`	`+from wagtail import blocks`
`2`	`2`
`3`	`3`	`from .base_field_block import BaseFieldBlock`
`4`	`4`