Change imports for wagtail2

wagtail_modeltranslation/management/commands/set_translation_url_paths.py

@@ -3,8 +3,11 @@
 from django.core.management.base import BaseCommand
 from modeltranslation import settings as mt_settings
 from modeltranslation.utils import build_localized_fieldname
-from wagtail.wagtailcore.models import Page
 from wagtail_modeltranslation.contextlib import use_language
+try:
+    from wagtail.core.models import Page
+except ImportError:
+    from wagtail.wagtailcore.models import Page
 
 
 class Command(BaseCommand):

wagtail_modeltranslation/management/commands/sync_page_translation_fields.py

@@ -1,6 +1,9 @@
 from modeltranslation.management.commands.sync_translation_fields import Command as SyncTranslationsFieldsCommand
 from modeltranslation.translator import translator
-from wagtail.wagtailcore.models import Page
+try:
+    from wagtail.core.models import Page
+except ImportError:
+    from wagtail.wagtailcore.models import Page
 
 
 old_get_registered_models = translator.get_registered_models

wagtail_modeltranslation/patch_wagtailadmin.py

@@ -15,19 +15,30 @@ from modeltranslation.translator import translator, NotRegistered
 from modeltranslation.utils import build_localized_fieldname, get_language
 from wagtail.contrib.settings.models import BaseSetting
 from wagtail.contrib.settings.views import get_setting_edit_handler
-from wagtail.contrib.wagtailroutablepage.models import RoutablePageMixin
-from wagtail.wagtailadmin.edit_handlers import FieldPanel, \
-    MultiFieldPanel, FieldRowPanel, InlinePanel, StreamFieldPanel, RichTextFieldPanel
-from wagtail.wagtailcore.models import Page
-from wagtail.wagtailcore.fields import StreamField, StreamValue
-from wagtail.wagtailcore.url_routing import RouteResult
-from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
-from wagtail.wagtailsearch.index import SearchField
-from wagtail.wagtailsnippets.models import get_snippet_models
-from wagtail.wagtailsnippets.views.snippets import SNIPPET_EDIT_HANDLERS
-
 from wagtail_modeltranslation.settings import CUSTOM_SIMPLE_PANELS, CUSTOM_COMPOSED_PANELS
 from wagtail_modeltranslation.utils import compare_class_tree_depth
+try:
+    from wagtail.contrib.routable_page.models import RoutablePageMixin
+    from wagtail.admin.edit_handlers import FieldPanel, \
+        MultiFieldPanel, FieldRowPanel, InlinePanel, StreamFieldPanel, RichTextFieldPanel
+    from wagtail.core.models import Page
+    from wagtail.core.fields import StreamField, StreamValue
+    from wagtail.core.url_routing import RouteResult
+    from wagtail.images.edit_handlers import ImageChooserPanel
+    from wagtail.search.index import SearchField
+    from wagtail.snippets.models import get_snippet_models
+    from wagtail.snippets.views.snippets import SNIPPET_EDIT_HANDLERS
+except ImportError:
+    from wagtail.contrib.wagtailroutablepage.models import RoutablePageMixin
+    from wagtail.wagtailadmin.edit_handlers import FieldPanel, \
+        MultiFieldPanel, FieldRowPanel, InlinePanel, StreamFieldPanel, RichTextFieldPanel
+    from wagtail.wagtailcore.models import Page
+    from wagtail.wagtailcore.fields import StreamField, StreamValue
+    from wagtail.wagtailcore.url_routing import RouteResult
+    from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
+    from wagtail.wagtailsearch.index import SearchField
+    from wagtail.wagtailsnippets.models import get_snippet_models
+    from wagtail.wagtailsnippets.views.snippets import SNIPPET_EDIT_HANDLERS
 
 logger = logging.getLogger('wagtail.core')
 

wagtail_modeltranslation/templatetags/wagtail_modeltranslation.py

@@ -8,8 +8,12 @@ from django.utils.translation import activate, get_language
 
 from six import iteritems
 
-from wagtail.wagtailcore.models import Page
-from wagtail.wagtailcore.templatetags.wagtailcore_tags import pageurl
+try:
+    from wagtail.core.models import Page
+    from wagtail.core.templatetags.wagtailcore_tags import pageurl
+except ImportError:
+    from wagtail.wagtailcore.models import Page
+    from wagtail.wagtailcore.templatetags.wagtailcore_tags import pageurl
 
 from modeltranslation import settings as mt_settings
 from modeltranslation.settings import DEFAULT_LANGUAGE

wagtail_modeltranslation/tests/models.py

@@ -2,14 +2,25 @@
 from django.db import models
 from django.http import HttpResponse
 from modelcluster.fields import ParentalKey
-from wagtail.contrib.wagtailroutablepage.models import RoutablePageMixin, route
-from wagtail.wagtailadmin.edit_handlers import FieldPanel, MultiFieldPanel, FieldRowPanel, InlinePanel, StreamFieldPanel
-from wagtail.wagtailcore import blocks
-from wagtail.wagtailcore.fields import StreamField
-from wagtail.wagtailcore.models import Page as WagtailPage
-from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
-from wagtail.wagtailsearch import index
-from wagtail.wagtailsnippets.models import register_snippet
+try:
+    from wagtail.contrib.routable_page.models import RoutablePageMixin, route
+    from wagtail.admin.edit_handlers import FieldPanel, MultiFieldPanel, FieldRowPanel, InlinePanel, StreamFieldPanel
+    from wagtail.core import blocks
+    from wagtail.core.fields import StreamField
+    from wagtail.core.models import Page as WagtailPage
+    from wagtail.images.edit_handlers import ImageChooserPanel
+    from wagtail.search import index
+    from wagtail.snippets.models import register_snippet
+except ImportError:
+    from wagtail.contrib.wagtailroutablepage.models import RoutablePageMixin, route
+    from wagtail.wagtailadmin.edit_handlers import FieldPanel, MultiFieldPanel, FieldRowPanel, InlinePanel, \
+        StreamFieldPanel
+    from wagtail.wagtailcore import blocks
+    from wagtail.wagtailcore.fields import StreamField
+    from wagtail.wagtailcore.models import Page as WagtailPage
+    from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
+    from wagtail.wagtailsearch import index
+    from wagtail.wagtailsnippets.models import register_snippet
 
 
 # Wagtail Models

wagtail_modeltranslation/tests/tests.py

@@ -59,12 +59,16 @@ class WagtailModeltranslationTransactionTestBase(TransactionTestCase):
 
                 # reload the translation module to register the Page model
                 # and also edit_handlers so any patches made to Page are reapplied
-                from wagtail_modeltranslation import translation as wag_translation
-                from wagtail.wagtailadmin import edit_handlers
                 import sys
                 del cls.cache.all_models['wagtailcore']
                 sys.modules.pop('wagtail_modeltranslation.translation.pagetr', None)
-                sys.modules.pop('wagtail.wagtailcore.models', None)
+                from wagtail_modeltranslation import translation as wag_translation
+                try:
+                    from wagtail.admin import edit_handlers
+                    sys.modules.pop('wagtail.core.models', None)
+                except ImportError:
+                    from wagtail.wagtailadmin import edit_handlers
+                    sys.modules.pop('wagtail.wagtailcore.models', None)
                 imp.reload(wag_translation)
                 imp.reload(edit_handlers)  # so Page can be repatched by edit_handlers
                 wagtailcore_args = []
@@ -136,7 +140,7 @@ class WagtailModeltranslationTest(WagtailModeltranslationTestBase):
         super(WagtailModeltranslationTest, cls).setUpClass()
 
         # Delete the default wagtail pages from db
-        from wagtail.wagtailcore.models import Page
+        from wagtail.core.models import Page
         Page.objects.delete()
 
     def test_page_fields(self):
@@ -170,7 +174,7 @@ class WagtailModeltranslationTest(WagtailModeltranslationTestBase):
         self.assertEquals(len(panels), 2)
 
         # Validate if the created panels are instances of FieldPanel
-        from wagtail.wagtailadmin.edit_handlers import FieldPanel
+        from wagtail.admin.edit_handlers import FieldPanel
         self.assertIsInstance(panels[0], FieldPanel)
         self.assertIsInstance(panels[1], FieldPanel)
 
@@ -182,7 +186,7 @@ class WagtailModeltranslationTest(WagtailModeltranslationTestBase):
         # Check if there is one panel per language
         self.assertEquals(len(panels), 2)
 
-        from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
+        from wagtail.images.edit_handlers import ImageChooserPanel
         self.assertIsInstance(panels[0], ImageChooserPanel)
         self.assertIsInstance(panels[1], ImageChooserPanel)
 
@@ -194,7 +198,7 @@ class WagtailModeltranslationTest(WagtailModeltranslationTestBase):
         # Check if the fieldrowpanel still exists
         self.assertEqual(len(panels), 1)
 
-        from wagtail.wagtailadmin.edit_handlers import FieldRowPanel
+        from wagtail.admin.edit_handlers import FieldRowPanel
         self.assertIsInstance(panels[0], FieldRowPanel)
 
         # Check if the children were correctly patched using the fieldpanel test
@@ -206,7 +210,7 @@ class WagtailModeltranslationTest(WagtailModeltranslationTestBase):
         # Check if there is one panel per language
         self.assertEquals(len(panels), 2)
 
-        from wagtail.wagtailadmin.edit_handlers import StreamFieldPanel
+        from wagtail.admin.edit_handlers import StreamFieldPanel
         self.assertIsInstance(panels[0], StreamFieldPanel)
         self.assertIsInstance(panels[1], StreamFieldPanel)
 
@@ -219,7 +223,7 @@ class WagtailModeltranslationTest(WagtailModeltranslationTestBase):
 
         self.assertEquals(len(child_block), 1)
 
-        from wagtail.wagtailcore.blocks import CharBlock
+        from wagtail.core.blocks import CharBlock
         self.assertEquals(child_block[0][0], 'text')
         self.assertIsInstance(child_block[0][1], CharBlock)
 
@@ -239,7 +243,7 @@ class WagtailModeltranslationTest(WagtailModeltranslationTestBase):
         # children panels
         self.assertEquals(len(panels), 3)
 
-        from wagtail.wagtailadmin.edit_handlers import MultiFieldPanel
+        from wagtail.admin.edit_handlers import MultiFieldPanel
         self.assertIsInstance(panels[0], MultiFieldPanel)
         self.assertIsInstance(panels[1], MultiFieldPanel)
         self.assertIsInstance(panels[2], MultiFieldPanel)
@@ -324,7 +328,7 @@ class WagtailModeltranslationTest(WagtailModeltranslationTestBase):
         In this test we use the InlinePanelSnippet model because it has all the possible "patchable" fields
         so if the created form has all fields the the form was correctly patched
         """
-        from wagtail.wagtailsnippets.views.snippets import get_snippet_edit_handler
+        from wagtail.snippets.views.snippets import get_snippet_edit_handler
         snippet_edit_handler = get_snippet_edit_handler(models.InlinePanelSnippet)
 
         form = snippet_edit_handler.get_form_class(models.InlinePanelSnippet)
@@ -343,7 +347,7 @@ class WagtailModeltranslationTest(WagtailModeltranslationTestBase):
             self.assertItemsEqual(inline_model_fields, related_formset_form.base_fields.keys())
 
     def test_duplicate_slug(self):
-        from wagtail.wagtailcore.models import Site
+        from wagtail.core.models import Site
         # Create a test Site with a root page
         root = models.TestRootPage(title='title', depth=1, path='0001', slug_en='slug_en', slug_de='slug_de')
         root.save()
@@ -406,7 +410,7 @@ class WagtailModeltranslationTest(WagtailModeltranslationTestBase):
         self.assertEqual(slugurl_trans(context, 'child-slugurl-en', 'en'), '/en/child-slugurl-en/')
 
     def test_relative_url(self):
-        from wagtail.wagtailcore.models import Site
+        from wagtail.core.models import Site
         # Create a test Site with a root page
         root = models.TestRootPage(title='title slugurl', depth=1, path='0004',
                                    slug_en='title_slugurl_en', slug_de='title_slugurl_de')
@@ -481,7 +485,7 @@ class WagtailModeltranslationTest(WagtailModeltranslationTestBase):
         Assert translation URL Paths are correctly set in page and descendants for a slug change and
         page move operations
         """
-        from wagtail.wagtailcore.models import Site
+        from wagtail.core.models import Site
         # Create a test Site with a root page
         root = models.TestRootPage.objects.create(title='url paths', depth=1, path='0006', slug='url-path-slug')
 

wagtail_modeltranslation/tests/urls.py

@@ -2,7 +2,10 @@
 from django.conf.urls import include, url
 from django.conf.urls.i18n import i18n_patterns
 from django.views.i18n import set_language
-from wagtail.wagtailcore import urls as wagtail_urls
+try:
+    from wagtail.core import urls as wagtail_urls
+except ImportError:
+    from wagtail.wagtailcore import urls as wagtail_urls
 
 urlpatterns = [
     url(r'^set_language/$', set_language, {},

wagtail_modeltranslation/tests/util.py

@@ -33,7 +33,10 @@ class PageFactory(object):
         if not nodes:
             return None
 
-        from wagtail.wagtailcore.models import Site
+        try:
+            from wagtail.core.models import Site
+        except ImportError:
+            from wagtail.wagtailcore.models import Site
         root_node = self.create_instance(nodes)
         site = Site.objects.create(root_page=root_node)
         return site

wagtail_modeltranslation/translation.py

@@ -2,8 +2,10 @@
 
 from modeltranslation.decorators import register
 from modeltranslation.translator import TranslationOptions
-from wagtail.wagtailcore.models import Page
-
+try:
+    from wagtail.core.models import Page
+except ImportError:
+    from wagtail.wagtailcore.models import Page
 
 @register(Page)
 class PageTR(TranslationOptions):

wagtail_modeltranslation/wagtail_hooks.py

@@ -9,9 +9,14 @@ from django.http import QueryDict
 from django.utils.html import format_html, format_html_join, escape
 from django.views.decorators.csrf import csrf_exempt
 from six import iteritems
-from wagtail.wagtailcore import hooks
-from wagtail.wagtailcore.models import Page
-from wagtail.wagtailcore.rich_text import PageLinkHandler
+try:
+    from wagtail.core import hooks
+    from wagtail.core.models import Page
+    from wagtail.core.rich_text import PageLinkHandler
+except ImportError:
+    from wagtail.wagtailcore import hooks
+    from wagtail.wagtailcore.models import Page
+    from wagtail.wagtailcore.rich_text import PageLinkHandler
 
 
 @hooks.register('insert_editor_js')