Wagtail5 compability

.gitignore

@@ -14,6 +14,7 @@
 *.wpu
 *~
 .cache
+.idea
 .coverage
 .tox
 .webassets-cache

docs/reference/models/calendar.rst

@@ -5,7 +5,7 @@ Calendar
 CalendarPage
 ------------
 .. inheritance-diagram:: CalendarPage
-    :top-classes: wagtail.core.models.Page
+    :top-classes: wagtail.models.Page
     :parts: 1
 .. autoclass:: CalendarPage
     :show-inheritance:

docs/reference/models/events.rst

@@ -46,7 +46,7 @@ EventsOnDay
 EventCategory
 -------------
 .. inheritance-diagram:: EventCategory
-    :top-classes: wagtail.core.models.Page
+    :top-classes: wagtail.models.Page
     :parts: 1
 .. autoclass:: EventCategory
     :show-inheritance:
@@ -126,7 +126,7 @@ EventBase
 SimpleEventPage
 ---------------
 .. inheritance-diagram:: SimpleEventPage
-    :top-classes: wagtail.core.models.Page, ls.joyous.models.event_base.EventBase
+    :top-classes: wagtail.models.Page, ls.joyous.models.event_base.EventBase
     :parts: 1
 .. autoclass:: SimpleEventPage
     :show-inheritance:
@@ -143,7 +143,7 @@ SimpleEventPage
 MultidayEventPage
 -----------------
 .. inheritance-diagram:: MultidayEventPage
-    :top-classes: wagtail.core.models.Page, ls.joyous.models.event_base.EventBase
+    :top-classes: wagtail.models.Page, ls.joyous.models.event_base.EventBase
     :parts: 1
 .. autoclass:: MultidayEventPage
     :show-inheritance:
@@ -164,7 +164,7 @@ MultidayEventPage
 RecurringEventPage
 ------------------
 .. inheritance-diagram:: RecurringEventPage
-    :top-classes: wagtail.core.models.Page, ls.joyous.models.event_base.EventBase
+    :top-classes: wagtail.models.Page, ls.joyous.models.event_base.EventBase
     :parts: 1
 .. autoclass:: RecurringEventPage
     :show-inheritance:
@@ -197,7 +197,7 @@ RecurringEventPage
 MultidayRecurringEventPage
 --------------------------
 .. inheritance-diagram:: MultidayRecurringEventPage
-    :top-classes: wagtail.core.models.Page, ls.joyous.models.recurring_events.RecurringEventPage
+    :top-classes: wagtail.models.Page, ls.joyous.models.recurring_events.RecurringEventPage
     :parts: 1
 .. autoclass:: MultidayRecurringEventPage
     :show-inheritance:
@@ -280,7 +280,7 @@ DateExceptionBase
 ExtraInfoPage
 -------------
 .. inheritance-diagram:: ExtraInfoPage
-    :top-classes: wagtail.core.models.Page, ls.joyous.models.recurring_events.DateExceptionBase
+    :top-classes: wagtail.models.Page, ls.joyous.models.recurring_events.DateExceptionBase
     :parts: 1
 .. autoclass:: ExtraInfoPage
     :show-inheritance:
@@ -325,7 +325,7 @@ CancellationBase
 CancellationPage
 ----------------
 .. inheritance-diagram:: CancellationPage
-    :top-classes: wagtail.core.models.Page, ls.joyous.models.recurring_events.DateExceptionBase, ls.joyous.models.recurring_events.CancellationBase
+    :top-classes: wagtail.models.Page, ls.joyous.models.recurring_events.DateExceptionBase, ls.joyous.models.recurring_events.CancellationBase
     :parts: 1
 .. autoclass:: CancellationPage
     :show-inheritance:
@@ -402,7 +402,7 @@ RescheduleMultidayEventPage
 ClosedForHolidaysPage
 ---------------------
 .. inheritance-diagram:: ClosedForHolidaysPage
-    :top-classes: wagtail.core.models.Page, ls.joyous.models.recurring_events.EventExceptionBase, ls.joyous.models.recurring_events.CancellationBase
+    :top-classes: wagtail.models.Page, ls.joyous.models.recurring_events.EventExceptionBase, ls.joyous.models.recurring_events.CancellationBase
     :parts: 1
 .. autoclass:: ClosedForHolidaysPage
     :show-inheritance:
@@ -431,7 +431,7 @@ ClosedForHolidaysPage
 ExtCancellationPage
 -------------------
 .. inheritance-diagram:: ExtCancellationPage
-    :top-classes: wagtail.core.models.Page, ls.joyous.models.recurring_events.EventExceptionBase, ls.joyous.models.recurring_events.CancellationBase
+    :top-classes: wagtail.models.Page, ls.joyous.models.recurring_events.EventExceptionBase, ls.joyous.models.recurring_events.CancellationBase
     :parts: 1
 .. autoclass:: ExtCancellationPage
     :show-inheritance:

docs/reference/models/groups.rst

@@ -9,7 +9,7 @@ Groups
 GroupPage
 ---------
 .. inheritance-diagram:: GroupPage
-    :top-classes: wagtail.core.models.Page
+    :top-classes: wagtail.models.Page
     :parts: 1
 .. autoclass:: GroupPage
     :show-inheritance:

docs/releases/1.4.0.rst

@@ -18,7 +18,7 @@ Compatibility with Wagtail 2.11
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Now that 2.11 is the new LTS for Wagtail
 replace request.site with Site.find_for_request(request) removing the need 
-for wagtail.core.middleware.SiteMiddleware.  Thanks to Tomas Walch for this.
+for wagtail.middleware.SiteMiddleware.  Thanks to Tomas Walch for this.
 
 Compatibility with Wagtail 2.12
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

ls/joyous/edit_handlers.py

@@ -4,7 +4,7 @@
 from django.conf import settings
 from django.utils import timezone
 from django.utils.formats import get_format_modules
-from wagtail.admin.edit_handlers import (FieldPanel, MultiFieldPanel)
+from wagtail.admin.panels import (FieldPanel, MultiFieldPanel)
 from wagtail.admin.widgets import AdminDateInput, AdminTimeInput
 try:
     from wagtail.admin.localization import get_available_admin_languages

ls/joyous/forms.py

@@ -3,7 +3,7 @@
 # ------------------------------------------------------------------------------
 import warnings
 from django.conf import settings
-from wagtail.core.models import PageBase
+from wagtail.models import PageBase
 from wagtail.admin.forms import WagtailAdminPageForm
 
 # ------------------------------------------------------------------------------
@@ -44,7 +44,7 @@ def save(self, commit=True):
         return page
 
     def _get_assimilated_form(self, assimilated_class):
-        # based on wagtail.admin.edit_handlers.get_form_for_model
+        # based on wagtail.admin.panels.get_form_for_model
         assimilated_class.declared_fields.update(self.declared_fields)
         attrs = {'model':    self._meta.model,
                  'fields':   self._meta.fields,

ls/joyous/migrations/0001_initial.py

@@ -7,7 +7,7 @@
 import django.db.models.deletion
 import ls.joyous.fields
 import wagtail.contrib.routable_page.models
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -24,7 +24,7 @@ class Migration(migrations.Migration):
             name='CalendarPage',
             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')),
-                ('intro', wagtail.core.fields.RichTextField(blank=True)),
+                ('intro', wagtail.fields.RichTextField(blank=True)),
             ],
             options={
                 'abstract': False,
@@ -37,7 +37,7 @@ class Migration(migrations.Migration):
                 ('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')),
                 ('except_date', models.DateField(help_text='For this date', verbose_name='For Date')),
                 ('cancellation_title', models.CharField(blank=True, help_text='Show in place of cancelled event (Leave empty to show nothing)', max_length=255, verbose_name='Title')),
-                ('cancellation_details', wagtail.core.fields.RichTextField(blank=True, help_text='Why was the event cancelled?', verbose_name='Details')),
+                ('cancellation_details', wagtail.fields.RichTextField(blank=True, help_text='Why was the event cancelled?', verbose_name='Details')),
             ],
             options={
                 'verbose_name': 'Cancellation',
@@ -62,7 +62,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')),
                 ('except_date', models.DateField(help_text='For this date', verbose_name='For Date')),
-                ('extra_information', wagtail.core.fields.RichTextField(help_text='Information just for this date')),
+                ('extra_information', wagtail.fields.RichTextField(help_text='Information just for this date')),
             ],
             options={
                 'verbose_name': 'Extra Event Information',
@@ -73,7 +73,7 @@ class Migration(migrations.Migration):
             name='GroupPage',
             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')),
-                ('content', wagtail.core.fields.RichTextField(blank=True, default='')),
+                ('content', wagtail.fields.RichTextField(blank=True, default='')),
             ],
             options={
                 'abstract': False,
@@ -87,7 +87,7 @@ class Migration(migrations.Migration):
                 ('time_from', models.TimeField(blank=True, null=True, verbose_name='Start time')),
                 ('time_to', models.TimeField(blank=True, null=True, verbose_name='End time')),
                 ('location', models.CharField(blank=True, max_length=255)),
-                ('details', wagtail.core.fields.RichTextField(blank=True)),
+                ('details', wagtail.fields.RichTextField(blank=True)),
                 ('website', models.URLField(blank=True)),
                 ('date_from', models.DateField(default=datetime.date.today, verbose_name='Start date')),
                 ('date_to', models.DateField(default=datetime.date.today, verbose_name='End date')),
@@ -107,7 +107,7 @@ class Migration(migrations.Migration):
                 ('time_from', models.TimeField(blank=True, null=True, verbose_name='Start time')),
                 ('time_to', models.TimeField(blank=True, null=True, verbose_name='End time')),
                 ('location', models.CharField(blank=True, max_length=255)),
-                ('details', wagtail.core.fields.RichTextField(blank=True)),
+                ('details', wagtail.fields.RichTextField(blank=True)),
                 ('website', models.URLField(blank=True)),
                 ('repeat', ls.joyous.fields.RecurrenceField()),
                 ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='joyous.EventCategory', verbose_name='Category')),
@@ -126,7 +126,7 @@ class Migration(migrations.Migration):
                 ('time_from', models.TimeField(blank=True, null=True, verbose_name='Start time')),
                 ('time_to', models.TimeField(blank=True, null=True, verbose_name='End time')),
                 ('location', models.CharField(blank=True, max_length=255)),
-                ('details', wagtail.core.fields.RichTextField(blank=True)),
+                ('details', wagtail.fields.RichTextField(blank=True)),
                 ('website', models.URLField(blank=True)),
                 ('date', models.DateField(default=datetime.date.today, verbose_name='Date')),
                 ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='joyous.EventCategory', verbose_name='Category')),
@@ -145,7 +145,7 @@ class Migration(migrations.Migration):
                 ('time_from', models.TimeField(blank=True, null=True, verbose_name='Start time')),
                 ('time_to', models.TimeField(blank=True, null=True, verbose_name='End time')),
                 ('location', models.CharField(blank=True, max_length=255)),
-                ('details', wagtail.core.fields.RichTextField(blank=True)),
+                ('details', wagtail.fields.RichTextField(blank=True)),
                 ('website', models.URLField(blank=True)),
                 ('postponement_title', models.CharField(help_text='The title for the postponed event', max_length=255, verbose_name='Title')),
                 ('date', models.DateField(verbose_name='Date')),

ls/joyous/migrations/0002_auto_20180228_1449.py

@@ -3,7 +3,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -20,6 +20,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='grouppage',
             name='content',
-            field=wagtail.core.fields.RichTextField(blank=True, default='', help_text='An area of text for whatever you like'),
+            field=wagtail.fields.RichTextField(blank=True, default='', help_text='An area of text for whatever you like'),
         ),
     ]

ls/joyous/migrations/0013_auto_20190221_1152.py

@@ -7,7 +7,7 @@
 import ls.joyous.fields
 import ls.joyous.models.events
 import timezone_field.fields
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -61,7 +61,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='calendarpage',
             name='intro',
-            field=wagtail.core.fields.RichTextField(blank=True, verbose_name='intro'),
+            field=wagtail.fields.RichTextField(blank=True, verbose_name='intro'),
         ),
         migrations.AlterField(
             model_name='calendarpage',
@@ -71,7 +71,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='cancellationpage',
             name='cancellation_details',
-            field=wagtail.core.fields.RichTextField(blank=True, help_text='Why was the event cancelled?', verbose_name='details'),
+            field=wagtail.fields.RichTextField(blank=True, help_text='Why was the event cancelled?', verbose_name='details'),
         ),
         migrations.AlterField(
             model_name='cancellationpage',
@@ -96,7 +96,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='extrainfopage',
             name='extra_information',
-            field=wagtail.core.fields.RichTextField(help_text='Information just for this date', verbose_name='extra information'),
+            field=wagtail.fields.RichTextField(help_text='Information just for this date', verbose_name='extra information'),
         ),
         migrations.AlterField(
             model_name='extrainfopage',
@@ -111,7 +111,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='grouppage',
             name='content',
-            field=wagtail.core.fields.RichTextField(blank=True, default='', help_text='An area of text for whatever you like', verbose_name='content'),
+            field=wagtail.fields.RichTextField(blank=True, default='', help_text='An area of text for whatever you like', verbose_name='content'),
         ),
         migrations.AlterField(
             model_name='multidayeventpage',
@@ -131,7 +131,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='multidayeventpage',
             name='details',
-            field=wagtail.core.fields.RichTextField(blank=True, verbose_name='details'),
+            field=wagtail.fields.RichTextField(blank=True, verbose_name='details'),
         ),
         migrations.AlterField(
             model_name='multidayeventpage',
@@ -181,7 +181,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='postponementpage',
             name='details',
-            field=wagtail.core.fields.RichTextField(blank=True, verbose_name='details'),
+            field=wagtail.fields.RichTextField(blank=True, verbose_name='details'),
         ),
         migrations.AlterField(
             model_name='postponementpage',
@@ -226,7 +226,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='recurringeventpage',
             name='details',
-            field=wagtail.core.fields.RichTextField(blank=True, verbose_name='details'),
+            field=wagtail.fields.RichTextField(blank=True, verbose_name='details'),
         ),
         migrations.AlterField(
             model_name='recurringeventpage',
@@ -286,7 +286,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='simpleeventpage',
             name='details',
-            field=wagtail.core.fields.RichTextField(blank=True, verbose_name='details'),
+            field=wagtail.fields.RichTextField(blank=True, verbose_name='details'),
         ),
         migrations.AlterField(
             model_name='simpleeventpage',

ls/joyous/migrations/0014_auto_20190328_0652.py

@@ -1,7 +1,7 @@
 # Generated by Django 2.1.5 on 2019-03-27 17:52
 
 from django.db import migrations
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -30,11 +30,11 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='calendarpage',
             name='intro',
-            field=wagtail.core.fields.RichTextField(blank=True, help_text='Introductory text.', verbose_name='intro'),
+            field=wagtail.fields.RichTextField(blank=True, help_text='Introductory text.', verbose_name='intro'),
         ),
         migrations.AlterField(
             model_name='extrainfopage',
             name='extra_information',
-            field=wagtail.core.fields.RichTextField(blank=True, help_text='Information just for this date', verbose_name='extra information'),
+            field=wagtail.fields.RichTextField(blank=True, help_text='Information just for this date', verbose_name='extra information'),
         ),
     ]

ls/joyous/migrations/0016_closedfor_closedforholidayspage.py

@@ -3,7 +3,7 @@
 from django.db import migrations, models
 import django.db.models.deletion
 import modelcluster.fields
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
                 ('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')),
                 ('all_holidays', models.BooleanField(default=True, help_text='Cancel any occurence of this event on a public holiday')),
                 ('cancellation_title', models.CharField(blank=True, help_text='Show in place of cancelled event (Leave empty to show nothing)', max_length=255, verbose_name='title')),
-                ('cancellation_details', wagtail.core.fields.RichTextField(blank=True, help_text='Why was the event cancelled?', verbose_name='details')),
+                ('cancellation_details', wagtail.fields.RichTextField(blank=True, help_text='Why was the event cancelled?', verbose_name='details')),
                 ('overrides', models.ForeignKey(help_text='The recurring event that we are updating.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='joyous.RecurringEventPage', verbose_name='overrides')),
             ],
             options={

ls/joyous/migrations/0017_extcancellationpage.py

@@ -2,7 +2,7 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import wagtail.core.fields
+import wagtail.fields
 
 
 class Migration(migrations.Migration):
@@ -17,7 +17,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')),
                 ('cancellation_title', models.CharField(blank=True, help_text='Show in place of cancelled event (Leave empty to show nothing)', max_length=255, verbose_name='title')),
-                ('cancellation_details', wagtail.core.fields.RichTextField(blank=True, help_text='Why was the event cancelled?', verbose_name='details')),
+                ('cancellation_details', wagtail.fields.RichTextField(blank=True, help_text='Why was the event cancelled?', verbose_name='details')),
                 ('cancelled_from_date', models.DateField(help_text='Cancelled from this date', verbose_name='From Date')),
                 ('cancelled_to_date', models.DateField(blank=True, help_text='Cancelled to this date (Leave empty for "until further notice")', null=True, verbose_name='To Date')),
                 ('overrides', models.ForeignKey(help_text='The recurring event that we are updating.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='joyous.RecurringEventPage', verbose_name='overrides')),