Rename wagtail.wagtailimages to wagtail.images

Conflicts:
	docs/advanced_topics/api/v2/configuration.rst
	docs/advanced_topics/jinja2.rst
	docs/advanced_topics/settings.rst
	docs/getting_started/integrating_into_django.rst
	docs/getting_started/tutorial.rst
	docs/topics/pages.rst
	docs/topics/streamfield.rst
	gulpfile.js/config.js
	tox.ini
	wagtail/admin/tests/test_compare.py
	wagtail/admin/tests/test_edit_handlers.py
	wagtail/api/v2/signal_handlers.py
	wagtail/contrib/wagtailstyleguide/views.py
	wagtail/core/tests/test_streamfield.py
	wagtail/documents/tests/test_models.py
	wagtail/images/models.py
	wagtail/images/permissions.py
	wagtail/images/tests/test_admin_views.py
	wagtail/images/tests/test_image_operations.py
	wagtail/images/tests/test_models.py
	wagtail/images/tests/test_signal_handlers.py
	wagtail/images/views/chooser.py
	wagtail/images/views/images.py
	wagtail/images/views/multiple.py
	wagtail/images/wagtail_hooks.py
	wagtail/images/widgets.py
	wagtail/project_template/project_name/settings/base.py
	wagtail/tests/demosite/models.py
	wagtail/tests/non_root_urls.py
	wagtail/tests/settings.py
	wagtail/tests/testapp/migrations/0001_initial.py
	wagtail/tests/testapp/migrations/0008_inlinestreampage_inlinestreampagesection.py
	wagtail/tests/testapp/migrations/0009_defaultstreampage.py
	wagtail/tests/urls.py

.tx/config

@@ -20,8 +20,8 @@ source_lang = en
 type = PO
 
 [wagtail.wagtailimages]
-file_filter = wagtail/wagtailimages/locale/<lang>/LC_MESSAGES/django.po
-source_file = wagtail/wagtailimages/locale/en/LC_MESSAGES/django.po
+file_filter = wagtail/images/locale/<lang>/LC_MESSAGES/django.po
+source_file = wagtail/images/locale/en/LC_MESSAGES/django.po
 source_lang = en
 type = PO
 

docs/advanced_topics/api/v2/configuration.rst

@@ -44,7 +44,7 @@ can hook into the rest of your project.
 Wagtail provides three endpoint classes you can use:
 
  - Pages :class:`wagtail.api.v2.endpoints.PagesAPIEndpoint`
- - Images :class:`wagtail.wagtailimages.api.v2.endpoints.ImagesAPIEndpoint`
+ - Images :class:`wagtail.images.api.v2.endpoints.ImagesAPIEndpoint`
  - Documents :class:`wagtail.documents.api.v2.endpoints.DocumentsAPIEndpoint`
 
 You can subclass any of these endpoint classes to customise their functionality.
@@ -60,7 +60,7 @@ types in their default configuration:
 
     from wagtail.api.v2.endpoints import PagesAPIEndpoint
     from wagtail.api.v2.router import WagtailAPIRouter
-    from wagtail.wagtailimages.api.v2.endpoints import ImagesAPIEndpoint
+    from wagtail.images.api.v2.endpoints import ImagesAPIEndpoint
     from wagtail.documents.api.v2.endpoints import DocumentsAPIEndpoint
 
     # Create the router. "wagtailapi" is the URL namespace
@@ -195,7 +195,7 @@ This adds two fields to the API (other fields omitted for brevity):
 Images in the API
 -----------------
 
-The :class:`~wagtail.wagtailimages.api.fields.ImageRenditionField` serialiser
+The :class:`~wagtail.images.api.fields.ImageRenditionField` serialiser
 allows you to add renditions of images into your API. It requires an image
 filter string specifying the resize operations to perform on the image. It can
 also take the ``source`` keyword argument described above.
@@ -204,7 +204,7 @@ For example:
 
 .. code-block:: python
 
-    from wagtail.wagtailimages.api.fields import ImageRenditionField
+    from wagtail.images.api.fields import ImageRenditionField
 
     class BlogPage(Page):
         ...

docs/advanced_topics/customisation/page_editing_interface.rst

@@ -148,7 +148,7 @@ As an example, add a "thumbnail" format:
 .. code-block:: python
 
     # image_formats.py
-    from wagtail.wagtailimages.formats import Format, register_image_format
+    from wagtail.images.formats import Format, register_image_format
 
     register_image_format(Format('thumbnail', 'Thumbnail', 'richtext-image thumbnail', 'max-120x120'))
 

docs/advanced_topics/images/custom_image_model.rst

@@ -10,10 +10,10 @@ to images.
 To do this, you need to add two models to your project:
 
  - The image model itself that inherits from
-   ``wagtail.wagtailimages.models.AbstractImage``. This is where you would add
+   ``wagtail.images.models.AbstractImage``. This is where you would add
    your additional fields
  - The renditions model that inherits from
-   ``wagtail.wagtailimages.models.AbstractRendition``. This is used to store
+   ``wagtail.images.models.AbstractRendition``. This is used to store
    renditions for the new model.
 
 Here's an example:
@@ -23,7 +23,7 @@ Here's an example:
     # models.py
     from django.db import models
 
-    from wagtail.wagtailimages.models import Image, AbstractImage, AbstractRendition
+    from wagtail.images.models import Image, AbstractImage, AbstractRendition
 
 
     class CustomImage(AbstractImage):
@@ -80,7 +80,7 @@ Then set the ``WAGTAILIMAGES_IMAGE_MODEL`` setting to point to it:
 Referring to the image model
 ============================
 
-.. module:: wagtail.wagtailimages
+.. module:: wagtail.images
 
 .. autofunction:: get_image_model
 

docs/advanced_topics/images/feature_detection.rst

@@ -79,7 +79,7 @@ You can manually run feature detection on all images by running the following co
 
  .. code-block:: python
 
-    from wagtail.wagtailimages.models import Image
+    from wagtail.images.models import Image
 
     for image in Image.objects.all():
         if not image.has_focal_point():

docs/advanced_topics/images/image_serve_view.rst

@@ -23,7 +23,7 @@ Add an entry for the view into your URLs configuration:
 
  .. code-block:: python
 
-    from wagtail.wagtailimages.views.serve import ServeView
+    from wagtail.images.views.serve import ServeView
 
     urlpatterns = [
         ...
@@ -60,7 +60,7 @@ block the initial response while rendering like the ``{% image %}`` tag does.
 .. code-block:: python
 
     from django.urls import reverse
-    from wagtail.wagtailimages.views.serve import generate_signature
+    from wagtail.images.views.serve import generate_signature
 
     def generate_image_url(image, filter_spec):
         signature = generate_signature(image.id, filter_spec)
@@ -109,7 +109,7 @@ method in your urls configuration:
 
 .. code-block:: python
 
-   from wagtail.wagtailimages.views.serve import ServeView
+   from wagtail.images.views.serve import ServeView
 
    urlpatterns = [
        ...
@@ -138,7 +138,7 @@ This view can be used out of the box:
 
 .. code-block:: python
 
-   from wagtail.wagtailimages.views.serve import SendFileView
+   from wagtail.images.views.serve import SendFileView
 
    urlpatterns = [
        ...
@@ -151,7 +151,7 @@ setting:
 
 .. code-block:: python
 
-    from wagtail.wagtailimages.views.serve import SendFileView
+    from wagtail.images.views.serve import SendFileView
     from project.sendfile_backends import MyCustomBackend
 
     class MySendFileView(SendFileView):
@@ -163,7 +163,7 @@ is to be authenticated (e.g. for Django >= 1.9):
 .. code-block:: python
 
     from django.contrib.auth.mixins import LoginRequiredMixin
-    from wagtail.wagtailimages.views.serve import SendFileView
+    from wagtail.images.views.serve import SendFileView
 
     class PrivateSendFileView(LoginRequiredMixin, SendFileView):
         raise_exception = True

docs/advanced_topics/jinja2.rst

@@ -26,7 +26,7 @@ Django needs to be configured to support Jinja2 templates. As the Wagtail admin
                 'extensions': [
                     'wagtail.core.jinja2tags.core',
                     'wagtail.admin.jinja2tags.userbar',
-                    'wagtail.wagtailimages.jinja2tags.images',
+                    'wagtail.images.jinja2tags.images',
                 ],
             },
         }

docs/advanced_topics/settings.rst

@@ -67,7 +67,7 @@ Apps (``settings.py``)
     'wagtail.wagtailusers',
     'wagtail.wagtailsnippets',
     'wagtail.documents',
-    'wagtail.wagtailimages',
+    'wagtail.images',
     'wagtail.wagtailsearch',
     'wagtail.admin',
     'wagtail.core',
@@ -509,7 +509,7 @@ These two files should reside in your project directory (``myproject/myproject/`
       'wagtail.wagtailusers',
       'wagtail.wagtailsnippets',
       'wagtail.documents',
-      'wagtail.wagtailimages',
+      'wagtail.images',
       'wagtail.wagtailsearch',
       'wagtail.admin',
       'wagtail.core',

docs/getting_started/integrating_into_django.rst

@@ -27,7 +27,7 @@ In your settings file, add the following apps to ``INSTALLED_APPS``:
     'wagtail.wagtailusers',
     'wagtail.wagtailsnippets',
     'wagtail.documents',
-    'wagtail.wagtailimages',
+    'wagtail.images',
     'wagtail.wagtailsearch',
     'wagtail.admin',
     'wagtail.core',

docs/getting_started/tutorial.rst

@@ -412,7 +412,7 @@ Add a new ``BlogPageGalleryImage`` model to ``models.py``:
     from wagtail.core.models import Page, Orderable
     from wagtail.core.fields import RichTextField
     from wagtail.admin.edit_handlers import FieldPanel, InlinePanel
-    from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
+    from wagtail.images.edit_handlers import ImageChooserPanel
     from wagtail.wagtailsearch import index
 
 
@@ -575,7 +575,7 @@ First, alter ``models.py`` once more:
     from wagtail.core.models import Page, Orderable
     from wagtail.core.fields import RichTextField
     from wagtail.admin.edit_handlers import FieldPanel, InlinePanel, MultiFieldPanel
-    from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
+    from wagtail.images.edit_handlers import ImageChooserPanel
     from wagtail.wagtailsearch import index
 
 

docs/reference/contrib/modeladmin/inspectview.rst

@@ -32,7 +32,7 @@ or attribute on the instance that you'd like ``InpectView`` to render.
 
 A sensible value will be rendered for most field types.
 
-If you have ``wagtail.wagtailimages`` installed, and the value happens to be an
+If you have ``wagtail.images`` installed, and the value happens to be an
 instance of ``wagtailimages.models.Image`` (or a custom model that subclasses
 ``wagtailimages.models.AbstractImage``), a thumbnail of that image will be
 rendered.

docs/reference/pages/panels.rst

@@ -129,16 +129,16 @@ PageChooserPanel
 ImageChooserPanel
 -----------------
 
-.. module:: wagtail.wagtailimages.edit_handlers
+.. module:: wagtail.images.edit_handlers
 
 .. class:: ImageChooserPanel(field_name)
 
-    Wagtail includes a unified image library, which you can access in your models through the :class:`~wagtail.wagtailimages.models.Image` model and the ``ImageChooserPanel`` chooser. Here's how:
+    Wagtail includes a unified image library, which you can access in your models through the :class:`~wagtail.images.models.Image` model and the ``ImageChooserPanel`` chooser. Here's how:
 
     .. code-block:: python
 
-      from wagtail.wagtailimages.models import Image
-      from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
+      from wagtail.images.models import Image
+      from wagtail.images.edit_handlers import ImageChooserPanel
 
 
       class BookPage(Page):

docs/topics/images.rst

@@ -253,7 +253,7 @@ done from the Django shell:
 .. code-block:: python
 
     # Replace this with your custom rendition model if you use one
-    >>> from wagtail.wagtailimages.models import Rendition
+    >>> from wagtail.images.models import Rendition
     >>> Rendition.objects.all().delete()
 
 Changing per-tag

docs/topics/pages.rst

@@ -29,7 +29,7 @@ This example represents a typical blog post:
     from wagtail.core.models import Page, Orderable
     from wagtail.core.fields import RichTextField
     from wagtail.admin.edit_handlers import FieldPanel, MultiFieldPanel, InlinePanel
-    from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
+    from wagtail.images.edit_handlers import ImageChooserPanel
     from wagtail.wagtailsearch import index
 
 
@@ -159,7 +159,7 @@ These are used for structuring fields in the interface.
 ``ForeignKey`` fields to certain models can use one of the below ``ChooserPanel`` classes. These add a nice modal chooser interface, and the image/document choosers also allow uploading new files without leaving the page editor.
 
  - :class:`~wagtail.admin.edit_handlers.PageChooserPanel`
- - :class:`~wagtail.wagtailimages.edit_handlers.ImageChooserPanel`
+ - :class:`~wagtail.images.edit_handlers.ImageChooserPanel`
  - :class:`~wagtail.documents.edit_handlers.DocumentChooserPanel`
  - :class:`~wagtail.wagtailsnippets.edit_handlers.SnippetChooserPanel`
 

docs/topics/search/searching.rst

@@ -50,7 +50,7 @@ Wagtail's document and image models provide a ``search`` method on their QuerySe
 
 .. code-block:: python
 
-    >>> from wagtail.wagtailimages.models import Image
+    >>> from wagtail.images.models import Image
 
     >>> Image.objects.filter(uploaded_by_user=user).search("Hello")
     [<Image: Hello>, <Image: Hello world!>]

docs/topics/streamfield.rst

@@ -23,7 +23,7 @@ Using StreamField
     from wagtail.core.fields import StreamField
     from wagtail.core import blocks
     from wagtail.admin.edit_handlers import FieldPanel, StreamFieldPanel
-    from wagtail.wagtailimages.blocks import ImageChooserBlock
+    from wagtail.images.blocks import ImageChooserBlock
 
     class BlogPage(Page):
         author = models.CharField(max_length=255)
@@ -277,7 +277,7 @@ A control to allow the editor to select an existing document object, or upload a
 ImageChooserBlock
 ~~~~~~~~~~~~~~~~~
 
-``wagtail.wagtailimages.blocks.ImageChooserBlock``
+``wagtail.images.blocks.ImageChooserBlock``
 
 A control to allow the editor to select an existing image, or upload a new one. The keyword argument ``required`` (default: True) is accepted.
 

gulpfile.js/config.js

@@ -26,7 +26,7 @@ var apps = [
     new App('wagtail/admin'),
     new App('wagtail/documents'),
     new App('wagtail/embeds'),
-    new App('wagtail/wagtailimages'),
+    new App('wagtail/images'),
     new App('wagtail/wagtailsnippets'),
     new App('wagtail/wagtailusers'),
     new App('wagtail/contrib/wagtailstyleguide'),

tox.ini

@@ -26,8 +26,8 @@ ignore = D100,D101,D102,D103,D105,D200,D202,D204,D205,D209,D400,D401,E303,E501,N
 [testenv]
 install_command = pip install -e ".[testing]" -U {opts} {packages}
 commands =
-    elasticsearch2: coverage run runtests.py wagtail.wagtailsearch wagtail.documents wagtail.wagtailimages --elasticsearch2
-    elasticsearch5: coverage run runtests.py wagtail.wagtailsearch wagtail.documents wagtail.wagtailimages --elasticsearch5
+    elasticsearch2: coverage run runtests.py wagtail.wagtailsearch wagtail.documents wagtail.images --elasticsearch2
+    elasticsearch5: coverage run runtests.py wagtail.wagtailsearch wagtail.documents wagtail.images --elasticsearch5
     noelasticsearch: coverage run runtests.py
 
 basepython =

wagtail/admin/tests/api/test_images.py

@@ -5,8 +5,8 @@ import json
 from django.urls import reverse
 
 from wagtail.api.v2.tests.test_images import TestImageDetail, TestImageListing
-from wagtail.wagtailimages import get_image_model
-from wagtail.wagtailimages.tests.utils import get_test_image_file
+from wagtail.images import get_image_model
+from wagtail.images.tests.utils import get_test_image_file
 
 from .utils import AdminAPITestCase
 

wagtail/admin/tests/test_compare.py

@@ -10,8 +10,8 @@ from wagtail.tests.testapp.models import (
     EventCategory, EventPage, EventPageSpeaker, SimplePage, StreamPage, TaggedPage)
 from wagtail.admin import compare
 from wagtail.core.blocks import StreamValue
-from wagtail.wagtailimages import get_image_model
-from wagtail.wagtailimages.tests.utils import get_test_image_file
+from wagtail.images import get_image_model
+from wagtail.images.tests.utils import get_test_image_file
 
 
 class TestFieldComparison(TestCase):

wagtail/admin/tests/test_edit_handlers.py

@@ -19,7 +19,7 @@ from wagtail.admin.forms import WagtailAdminModelForm, WagtailAdminPageForm
 from wagtail.admin.rich_text import HalloRichTextArea
 from wagtail.admin.widgets import AdminAutoHeightTextInput, AdminDateInput, AdminPageChooser
 from wagtail.core.models import Page, Site
-from wagtail.wagtailimages.edit_handlers import ImageChooserPanel
+from wagtail.images.edit_handlers import ImageChooserPanel
 
 
 class TestGetFormForModel(TestCase):

wagtail/api/v2/signal_handlers.py

@@ -7,7 +7,7 @@ from wagtail.contrib.wagtailfrontendcache.utils import purge_url_from_cache
 from wagtail.core.models import get_page_models
 from wagtail.core.signals import page_published, page_unpublished
 from wagtail.documents.models import get_document_model
-from wagtail.wagtailimages import get_image_model
+from wagtail.images import get_image_model
 
 from .utils import get_base_url
 

wagtail/api/v2/tests/test_images.py

@@ -8,7 +8,7 @@ from django.test.utils import override_settings
 from django.urls import reverse
 
 from wagtail.api.v2 import signal_handlers
-from wagtail.wagtailimages import get_image_model
+from wagtail.images import get_image_model
 
 
 class TestImageListing(TestCase):

wagtail/contrib/modeladmin/mixins.py

@@ -21,9 +21,9 @@ class ThumbnailMixin(object):
     thumb_default = None
 
     def __init__(self, *args, **kwargs):
-        if 'wagtail.wagtailimages' not in settings.INSTALLED_APPS:
+        if 'wagtail.images' not in settings.INSTALLED_APPS:
             raise ImproperlyConfigured(
-                u"The `wagtail.wagtailimages` app must be installed in order "
+                u"The `wagtail.images` app must be installed in order "
                 "to use the `ThumbnailMixin` class."
             )
         super(ThumbnailMixin, self).__init__(*args, **kwargs)
@@ -48,7 +48,7 @@ class ThumbnailMixin(object):
             return ''
 
         # try to get a rendition of the image to use
-        from wagtail.wagtailimages.shortcuts import get_rendition_or_not_found
+        from wagtail.images.shortcuts import get_rendition_or_not_found
         spec = self.thumb_image_filter_spec
         rendition = get_rendition_or_not_found(image, spec)
         img_attrs.update({'src': rendition.url})

wagtail/contrib/modeladmin/tests/test_simple_modeladmin.py

@@ -7,8 +7,8 @@ from django.test import TestCase
 
 from wagtail.tests.modeladmintest.models import Author, Book, Publisher, Token
 from wagtail.tests.utils import WagtailTestUtils
-from wagtail.wagtailimages.models import Image
-from wagtail.wagtailimages.tests.utils import get_test_image_file
+from wagtail.images.models import Image
+from wagtail.images.tests.utils import get_test_image_file
 
 
 class TestBookIndexView(TestCase, WagtailTestUtils):

wagtail/contrib/modeladmin/views.py

@@ -869,9 +869,9 @@ class InspectView(InstanceSpecificView):
                 return ', '.join(['%s' % obj for obj in val])
             return self.model_admin.get_empty_value_display(field_name)
 
-        # wagtail.wagtailimages might not be installed
+        # wagtail.images might not be installed
         try:
-            from wagtail.wagtailimages.models import AbstractImage
+            from wagtail.images.models import AbstractImage
             if isinstance(val, AbstractImage):
                 # Render a rendition of the image
                 return self.get_image_field_display(field_name, field)
@@ -894,7 +894,7 @@ class InspectView(InstanceSpecificView):
 
     def get_image_field_display(self, field_name, field):
         """ Render an image """
-        from wagtail.wagtailimages.shortcuts import get_rendition_or_not_found
+        from wagtail.images.shortcuts import get_rendition_or_not_found
         image = getattr(self.instance, field_name)
         if image:
             return get_rendition_or_not_found(image, 'max-400x400').img_tag

wagtail/contrib/wagtailstyleguide/views.py

@@ -12,7 +12,7 @@ from wagtail.admin.widgets import (
     AdminAutoHeightTextInput, AdminDateInput, AdminDateTimeInput, AdminPageChooser, AdminTimeInput)
 from wagtail.core.models import Page
 from wagtail.documents.widgets import AdminDocumentChooser
-from wagtail.wagtailimages.widgets import AdminImageChooser
+from wagtail.images.widgets import AdminImageChooser
 from wagtail.wagtailsnippets.widgets import AdminSnippetChooser
 
 

wagtail/core/tests/test_permission_policies.py

@@ -8,8 +8,8 @@ from django.test import TestCase
 from wagtail.core.permission_policies import (
     AuthenticationOnlyPermissionPolicy, BlanketPermissionPolicy, ModelPermissionPolicy,
     OwnershipPermissionPolicy)
-from wagtail.wagtailimages.models import Image
-from wagtail.wagtailimages.tests.utils import get_test_image_file
+from wagtail.images.models import Image
+from wagtail.images.tests.utils import get_test_image_file
 
 
 class PermissionPolicyTestUtils(object):

wagtail/core/tests/test_streamfield.py

@@ -14,8 +14,8 @@ from wagtail.core import blocks
 from wagtail.core.blocks import StreamValue
 from wagtail.core.fields import StreamField
 from wagtail.core.rich_text import RichText
-from wagtail.wagtailimages.models import Image
-from wagtail.wagtailimages.tests.utils import get_test_image_file
+from wagtail.images.models import Image
+from wagtail.images.tests.utils import get_test_image_file
 
 
 class TestLazyStreamField(TestCase):

wagtail/documents/tests/test_models.py

@@ -10,7 +10,7 @@ from django.test.utils import override_settings
 from wagtail.core.models import Collection, GroupCollectionPermission
 from wagtail.documents import models, signal_handlers
 from wagtail.documents.models import get_document_model
-from wagtail.wagtailimages.tests.utils import get_test_image_file
+from wagtail.images.tests.utils import get_test_image_file
 
 
 class TestDocumentQuerySet(TestCase):

wagtail/images/__init__.py

@@ -4,7 +4,7 @@ from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
 
-default_app_config = 'wagtail.wagtailimages.apps.WagtailImagesAppConfig'
+default_app_config = 'wagtail.images.apps.WagtailImagesAppConfig'
 
 
 def get_image_model_string():
@@ -20,7 +20,7 @@ def get_image_model():
     """
     Get the image model from the ``WAGTAILIMAGES_IMAGE_MODEL`` setting.
     Useful for developers making Wagtail plugins that need the image model.
-    Defaults to the standard :class:`~wagtail.wagtailimages.models.Image` model
+    Defaults to the standard :class:`~wagtail.images.models.Image` model
     if no custom model is defined.
     """
     from django.apps import apps

wagtail/images/admin.py

@@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals
 from django.conf import settings
 from django.contrib import admin
 
-from wagtail.wagtailimages.models import Image
+from wagtail.images.models import Image
 
 if hasattr(settings, 'WAGTAILIMAGES_IMAGE_MODEL') and settings.WAGTAILIMAGES_IMAGE_MODEL != 'wagtailimages.Image':
     # This installation provides its own custom image class;

wagtail/images/admin_urls.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.conf.urls import url
 
-from wagtail.wagtailimages.views import chooser, images, multiple
+from wagtail.images.views import chooser, images, multiple
 
 app_name = 'wagtailimages'
 urlpatterns = [

wagtail/images/apps.py

@@ -6,10 +6,10 @@ from . import checks  # NOQA
 
 
 class WagtailImagesAppConfig(AppConfig):
-    name = 'wagtail.wagtailimages'
+    name = 'wagtail.images'
     label = 'wagtailimages'
     verbose_name = "Wagtail images"
 
     def ready(self):
-        from wagtail.wagtailimages.signal_handlers import register_signal_handlers
+        from wagtail.images.signal_handlers import register_signal_handlers
         register_signal_handlers()

wagtail/images/blocks.py

@@ -10,12 +10,12 @@ from .shortcuts import get_rendition_or_not_found
 class ImageChooserBlock(ChooserBlock):
     @cached_property
     def target_model(self):
-        from wagtail.wagtailimages import get_image_model
+        from wagtail.images import get_image_model
         return get_image_model()
 
     @cached_property
     def widget(self):
-        from wagtail.wagtailimages.widgets import AdminImageChooser
+        from wagtail.images.widgets import AdminImageChooser
         return AdminImageChooser
 
     def render_basic(self, value, context=None):

wagtail/images/forms.py

@@ -8,10 +8,10 @@ from django.utils.translation import ugettext as _
 from wagtail.admin import widgets
 from wagtail.admin.forms import (
     BaseCollectionMemberForm, collection_member_permission_formset_factory)
-from wagtail.wagtailimages.fields import WagtailImageField
-from wagtail.wagtailimages.formats import get_image_formats
-from wagtail.wagtailimages.models import Image
-from wagtail.wagtailimages.permissions import permission_policy as images_permission_policy
+from wagtail.images.fields import WagtailImageField
+from wagtail.images.formats import get_image_formats
+from wagtail.images.models import Image
+from wagtail.images.permissions import permission_policy as images_permission_policy
 
 
 # Callback to allow us to override the default form field for the image file field

wagtail/images/image_operations.py

@@ -2,8 +2,8 @@ from __future__ import absolute_import, division, unicode_literals
 
 import inspect
 
-from wagtail.wagtailimages.exceptions import InvalidFilterSpecError
-from wagtail.wagtailimages.rect import Rect
+from wagtail.images.exceptions import InvalidFilterSpecError
+from wagtail.images.rect import Rect
 
 
 class Operation(object):