Update paths

tests/test_blocks.py

@@ -1,7 +1,5 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.test import TestCase, override_settings
-from wagtail.wagtailcore.models import Page
+from wagtail.core.models import Page
 
 from core.models import SimplePage
 from wagtailmodelchoosers import blocks, widgets

tests/test_paginators.py

@@ -1 +0,0 @@
-from __future__ import absolute_import, unicode_literals

tests/test_widget.py

@@ -1,9 +1,7 @@
-from __future__ import absolute_import, unicode_literals
-
 import uuid
 
 from django.test import TestCase
-from wagtail.wagtailcore.models import Page
+from wagtail.core.models import Page
 
 from core.models import SimplePage
 from wagtailmodelchoosers import widgets

tests/testapp/core/migrations/0001_initial.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.7 on 2017-04-30 05:44
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 

tests/testapp/core/models.py

@@ -1,9 +1,7 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.db import models
 
-from wagtail.wagtailadmin.edit_handlers import FieldPanel
-from wagtail.wagtailcore.models import Page
+from wagtail.admin.edit_handlers import FieldPanel
+from wagtail.core.models import Page
 
 __all__ = ['SimplePage']
 

tests/testapp/manage.py

@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-from __future__ import absolute_import, unicode_literals
-
 import os
 import sys
 

tests/testapp/testapp/settings.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 
@@ -16,17 +14,17 @@
 INSTALLED_APPS = [
     'wagtailmodelchoosers',
 
-    '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',
 
     'modelcluster',
     'taggit',
@@ -51,8 +49,8 @@
     '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 = 'testapp.urls'
@@ -136,6 +134,6 @@
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
 try:
-    from .local import *
+    from .local import *  # noqa: F401, F403
 except ImportError:
     pass

tests/testapp/testapp/urls.py

@@ -1,12 +1,10 @@
-from __future__ import absolute_import, unicode_literals
-
 from django.conf import settings
 from django.conf.urls import include, url
 
-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.wagtailimages import urls as wagtailimages_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 wagtail.images import urls as wagtailimages_urls
 
 urlpatterns = [
     url(r'^admin/', include(wagtailadmin_urls)),

tests/testapp/testapp/wsgi.py

@@ -7,8 +7,6 @@
 https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/
 """
 
-from __future__ import absolute_import, unicode_literals
-
 import os
 
 from django.core.wsgi import get_wsgi_application

wagtailmodelchoosers/blocks.py

@@ -4,7 +4,7 @@
 from django.apps import apps
 from django.utils.functional import cached_property
 
-from wagtail.wagtailcore.blocks import ChooserBlock
+from wagtail.core.blocks import ChooserBlock
 
 from wagtailmodelchoosers.utils import first_non_empty, flatten, get_chooser_options
 from wagtailmodelchoosers.widgets import ModelChooserWidget, RemoteModelChooserWidget

wagtailmodelchoosers/edit_handlers.py

@@ -1,5 +1,5 @@
+from wagtail.admin.edit_handlers import BaseChooserPanel
 from wagtail.utils.decorators import cached_classmethod
-from wagtail.wagtailadmin.edit_handlers import BaseChooserPanel
 
 from wagtailmodelchoosers.utils import flatten, get_chooser_options
 from wagtailmodelchoosers.widgets import ModelChooserWidget, RemoteModelChooserWidget

wagtailmodelchoosers/wagtail_hooks.py

@@ -2,7 +2,7 @@
 from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.utils.html import format_html, format_html_join
 
-from wagtail.wagtailcore import hooks
+from wagtail.core import hooks
 
 from wagtailmodelchoosers.views import ModelView, RemoteResourceView