diff --git a/.tx/config b/.tx/config index 40e12695a4..9538a2b2b7 100644 --- a/.tx/config +++ b/.tx/config @@ -20,8 +20,8 @@ source_lang = en type = PO [wagtail.wagtailimages] -file_filter = wagtail/wagtailimages/locale//LC_MESSAGES/django.po -source_file = wagtail/wagtailimages/locale/en/LC_MESSAGES/django.po +file_filter = wagtail/images/locale//LC_MESSAGES/django.po +source_file = wagtail/images/locale/en/LC_MESSAGES/django.po source_lang = en type = PO diff --git a/docs/advanced_topics/api/v2/configuration.rst b/docs/advanced_topics/api/v2/configuration.rst index 5ae5eac92f..7189a2bd79 100644 --- a/docs/advanced_topics/api/v2/configuration.rst +++ b/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): ... diff --git a/docs/advanced_topics/customisation/page_editing_interface.rst b/docs/advanced_topics/customisation/page_editing_interface.rst index bbbefb6b52..0b505dbcf5 100644 --- a/docs/advanced_topics/customisation/page_editing_interface.rst +++ b/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')) diff --git a/docs/advanced_topics/images/custom_image_model.rst b/docs/advanced_topics/images/custom_image_model.rst index 8a23c7ac79..43c3cdb3f1 100644 --- a/docs/advanced_topics/images/custom_image_model.rst +++ b/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 diff --git a/docs/advanced_topics/images/feature_detection.rst b/docs/advanced_topics/images/feature_detection.rst index f44c7b3c3e..4af373a806 100644 --- a/docs/advanced_topics/images/feature_detection.rst +++ b/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(): diff --git a/docs/advanced_topics/images/image_serve_view.rst b/docs/advanced_topics/images/image_serve_view.rst index f591110877..fbd6fb86d3 100644 --- a/docs/advanced_topics/images/image_serve_view.rst +++ b/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 diff --git a/docs/advanced_topics/jinja2.rst b/docs/advanced_topics/jinja2.rst index 217b5ef00c..671cb63b49 100644 --- a/docs/advanced_topics/jinja2.rst +++ b/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', ], }, } diff --git a/docs/advanced_topics/settings.rst b/docs/advanced_topics/settings.rst index 777501a893..2461de9719 100644 --- a/docs/advanced_topics/settings.rst +++ b/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', diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst index c054e98185..c8c472ff14 100644 --- a/docs/getting_started/integrating_into_django.rst +++ b/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', diff --git a/docs/getting_started/tutorial.rst b/docs/getting_started/tutorial.rst index 8dce552f19..8bb5bf4540 100644 --- a/docs/getting_started/tutorial.rst +++ b/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 diff --git a/docs/reference/contrib/modeladmin/inspectview.rst b/docs/reference/contrib/modeladmin/inspectview.rst index 8be9a838f3..fdd87cfec1 100644 --- a/docs/reference/contrib/modeladmin/inspectview.rst +++ b/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. diff --git a/docs/reference/pages/panels.rst b/docs/reference/pages/panels.rst index 8a0aaa0d69..65966e395e 100644 --- a/docs/reference/pages/panels.rst +++ b/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): diff --git a/docs/topics/images.rst b/docs/topics/images.rst index 55318d981b..d38fad77b6 100644 --- a/docs/topics/images.rst +++ b/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 diff --git a/docs/topics/pages.rst b/docs/topics/pages.rst index a4d549f616..e2641b6309 100644 --- a/docs/topics/pages.rst +++ b/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` diff --git a/docs/topics/search/searching.rst b/docs/topics/search/searching.rst index e3269bb1f3..9194ee5dad 100644 --- a/docs/topics/search/searching.rst +++ b/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") [, ] diff --git a/docs/topics/streamfield.rst b/docs/topics/streamfield.rst index 443110d5b2..3f149266a1 100644 --- a/docs/topics/streamfield.rst +++ b/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. diff --git a/gulpfile.js/config.js b/gulpfile.js/config.js index 714321e2a3..ea8abf2855 100644 --- a/gulpfile.js/config.js +++ b/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'), diff --git a/tox.ini b/tox.ini index ecc071457d..2332bfac2a 100644 --- a/tox.ini +++ b/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 = diff --git a/wagtail/admin/tests/api/test_images.py b/wagtail/admin/tests/api/test_images.py index 43f7003214..8d7c10b682 100644 --- a/wagtail/admin/tests/api/test_images.py +++ b/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 diff --git a/wagtail/admin/tests/test_compare.py b/wagtail/admin/tests/test_compare.py index 67f5ea91ed..3013b24211 100644 --- a/wagtail/admin/tests/test_compare.py +++ b/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): diff --git a/wagtail/admin/tests/test_edit_handlers.py b/wagtail/admin/tests/test_edit_handlers.py index 1e5410edcf..f4a33c0822 100644 --- a/wagtail/admin/tests/test_edit_handlers.py +++ b/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): diff --git a/wagtail/api/v2/signal_handlers.py b/wagtail/api/v2/signal_handlers.py index 51644173bb..318a2d4dfb 100644 --- a/wagtail/api/v2/signal_handlers.py +++ b/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 diff --git a/wagtail/api/v2/tests/test_images.py b/wagtail/api/v2/tests/test_images.py index 3ef2b994ad..62a1ff888c 100644 --- a/wagtail/api/v2/tests/test_images.py +++ b/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): diff --git a/wagtail/contrib/modeladmin/mixins.py b/wagtail/contrib/modeladmin/mixins.py index e73f6f9f16..9e5032c8b2 100644 --- a/wagtail/contrib/modeladmin/mixins.py +++ b/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}) diff --git a/wagtail/contrib/modeladmin/tests/test_simple_modeladmin.py b/wagtail/contrib/modeladmin/tests/test_simple_modeladmin.py index 032bd3f0f4..864041fcd2 100644 --- a/wagtail/contrib/modeladmin/tests/test_simple_modeladmin.py +++ b/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): diff --git a/wagtail/contrib/modeladmin/views.py b/wagtail/contrib/modeladmin/views.py index c29e918d49..2aa0872819 100644 --- a/wagtail/contrib/modeladmin/views.py +++ b/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 diff --git a/wagtail/contrib/wagtailstyleguide/views.py b/wagtail/contrib/wagtailstyleguide/views.py index 90e3bf6861..45a3c1fff6 100644 --- a/wagtail/contrib/wagtailstyleguide/views.py +++ b/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 diff --git a/wagtail/core/tests/test_permission_policies.py b/wagtail/core/tests/test_permission_policies.py index 141acd685a..6c7a7906d2 100644 --- a/wagtail/core/tests/test_permission_policies.py +++ b/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): diff --git a/wagtail/core/tests/test_streamfield.py b/wagtail/core/tests/test_streamfield.py index b4ed770f54..49e3475d17 100644 --- a/wagtail/core/tests/test_streamfield.py +++ b/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): diff --git a/wagtail/documents/tests/test_models.py b/wagtail/documents/tests/test_models.py index 0d5ec231e7..2a6f0937db 100644 --- a/wagtail/documents/tests/test_models.py +++ b/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): diff --git a/wagtail/wagtailimages/.gitignore b/wagtail/images/.gitignore similarity index 100% rename from wagtail/wagtailimages/.gitignore rename to wagtail/images/.gitignore diff --git a/wagtail/wagtailimages/__init__.py b/wagtail/images/__init__.py similarity index 88% rename from wagtail/wagtailimages/__init__.py rename to wagtail/images/__init__.py index f9e64823a0..fc31ca0597 100644 --- a/wagtail/wagtailimages/__init__.py +++ b/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 diff --git a/wagtail/wagtailimages/admin.py b/wagtail/images/admin.py similarity index 90% rename from wagtail/wagtailimages/admin.py rename to wagtail/images/admin.py index ce88de26d4..37233dd3a2 100644 --- a/wagtail/wagtailimages/admin.py +++ b/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; diff --git a/wagtail/wagtailimages/admin_urls.py b/wagtail/images/admin_urls.py similarity index 94% rename from wagtail/wagtailimages/admin_urls.py rename to wagtail/images/admin_urls.py index 179f1399ed..3ef3ca716f 100644 --- a/wagtail/wagtailimages/admin_urls.py +++ b/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 = [ diff --git a/wagtail/wagtailimages/api/__init__.py b/wagtail/images/api/__init__.py similarity index 100% rename from wagtail/wagtailimages/api/__init__.py rename to wagtail/images/api/__init__.py diff --git a/wagtail/wagtailimages/api/admin/__init__.py b/wagtail/images/api/admin/__init__.py similarity index 100% rename from wagtail/wagtailimages/api/admin/__init__.py rename to wagtail/images/api/admin/__init__.py diff --git a/wagtail/wagtailimages/api/admin/endpoints.py b/wagtail/images/api/admin/endpoints.py similarity index 100% rename from wagtail/wagtailimages/api/admin/endpoints.py rename to wagtail/images/api/admin/endpoints.py diff --git a/wagtail/wagtailimages/api/admin/serializers.py b/wagtail/images/api/admin/serializers.py similarity index 100% rename from wagtail/wagtailimages/api/admin/serializers.py rename to wagtail/images/api/admin/serializers.py diff --git a/wagtail/wagtailimages/api/fields.py b/wagtail/images/api/fields.py similarity index 100% rename from wagtail/wagtailimages/api/fields.py rename to wagtail/images/api/fields.py diff --git a/wagtail/wagtailimages/api/v2/__init__.py b/wagtail/images/api/v2/__init__.py similarity index 100% rename from wagtail/wagtailimages/api/v2/__init__.py rename to wagtail/images/api/v2/__init__.py diff --git a/wagtail/wagtailimages/api/v2/endpoints.py b/wagtail/images/api/v2/endpoints.py similarity index 100% rename from wagtail/wagtailimages/api/v2/endpoints.py rename to wagtail/images/api/v2/endpoints.py diff --git a/wagtail/wagtailimages/api/v2/serializers.py b/wagtail/images/api/v2/serializers.py similarity index 100% rename from wagtail/wagtailimages/api/v2/serializers.py rename to wagtail/images/api/v2/serializers.py diff --git a/wagtail/wagtailimages/apps.py b/wagtail/images/apps.py similarity index 70% rename from wagtail/wagtailimages/apps.py rename to wagtail/images/apps.py index 3332191eec..31896d4d6e 100644 --- a/wagtail/wagtailimages/apps.py +++ b/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() diff --git a/wagtail/wagtailimages/blocks.py b/wagtail/images/blocks.py similarity index 83% rename from wagtail/wagtailimages/blocks.py rename to wagtail/images/blocks.py index 5bd10691e5..db647c2801 100644 --- a/wagtail/wagtailimages/blocks.py +++ b/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): diff --git a/wagtail/wagtailimages/check_files/wagtail.jpg b/wagtail/images/check_files/wagtail.jpg similarity index 100% rename from wagtail/wagtailimages/check_files/wagtail.jpg rename to wagtail/images/check_files/wagtail.jpg diff --git a/wagtail/wagtailimages/check_files/wagtail.png b/wagtail/images/check_files/wagtail.png similarity index 100% rename from wagtail/wagtailimages/check_files/wagtail.png rename to wagtail/images/check_files/wagtail.png diff --git a/wagtail/wagtailimages/checks.py b/wagtail/images/checks.py similarity index 100% rename from wagtail/wagtailimages/checks.py rename to wagtail/images/checks.py diff --git a/wagtail/wagtailimages/edit_handlers.py b/wagtail/images/edit_handlers.py similarity index 100% rename from wagtail/wagtailimages/edit_handlers.py rename to wagtail/images/edit_handlers.py diff --git a/wagtail/wagtailimages/exceptions.py b/wagtail/images/exceptions.py similarity index 100% rename from wagtail/wagtailimages/exceptions.py rename to wagtail/images/exceptions.py diff --git a/wagtail/wagtailimages/fields.py b/wagtail/images/fields.py similarity index 100% rename from wagtail/wagtailimages/fields.py rename to wagtail/images/fields.py diff --git a/wagtail/wagtailimages/formats.py b/wagtail/images/formats.py similarity index 100% rename from wagtail/wagtailimages/formats.py rename to wagtail/images/formats.py diff --git a/wagtail/wagtailimages/forms.py b/wagtail/images/forms.py similarity index 92% rename from wagtail/wagtailimages/forms.py rename to wagtail/images/forms.py index a287c0c6f3..af1f044c4f 100644 --- a/wagtail/wagtailimages/forms.py +++ b/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 diff --git a/wagtail/wagtailimages/image_operations.py b/wagtail/images/image_operations.py similarity index 98% rename from wagtail/wagtailimages/image_operations.py rename to wagtail/images/image_operations.py index a7058cc921..5ca436966e 100644 --- a/wagtail/wagtailimages/image_operations.py +++ b/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): diff --git a/wagtail/wagtailimages/jinja2tags.py b/wagtail/images/jinja2tags.py similarity index 100% rename from wagtail/wagtailimages/jinja2tags.py rename to wagtail/images/jinja2tags.py diff --git a/wagtail/wagtailimages/locale/ar/LC_MESSAGES/django.mo b/wagtail/images/locale/ar/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/ar/LC_MESSAGES/django.mo rename to wagtail/images/locale/ar/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/ar/LC_MESSAGES/django.po b/wagtail/images/locale/ar/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/ar/LC_MESSAGES/django.po rename to wagtail/images/locale/ar/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/bg/LC_MESSAGES/django.mo b/wagtail/images/locale/bg/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/bg/LC_MESSAGES/django.mo rename to wagtail/images/locale/bg/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/bg/LC_MESSAGES/django.po b/wagtail/images/locale/bg/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/bg/LC_MESSAGES/django.po rename to wagtail/images/locale/bg/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/ca/LC_MESSAGES/django.mo b/wagtail/images/locale/ca/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/ca/LC_MESSAGES/django.mo rename to wagtail/images/locale/ca/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/ca/LC_MESSAGES/django.po b/wagtail/images/locale/ca/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/ca/LC_MESSAGES/django.po rename to wagtail/images/locale/ca/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/cs/LC_MESSAGES/django.mo b/wagtail/images/locale/cs/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/cs/LC_MESSAGES/django.mo rename to wagtail/images/locale/cs/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/cs/LC_MESSAGES/django.po b/wagtail/images/locale/cs/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/cs/LC_MESSAGES/django.po rename to wagtail/images/locale/cs/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/de/LC_MESSAGES/django.mo b/wagtail/images/locale/de/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/de/LC_MESSAGES/django.mo rename to wagtail/images/locale/de/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/de/LC_MESSAGES/django.po b/wagtail/images/locale/de/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/de/LC_MESSAGES/django.po rename to wagtail/images/locale/de/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/el/LC_MESSAGES/django.mo b/wagtail/images/locale/el/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/el/LC_MESSAGES/django.mo rename to wagtail/images/locale/el/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/el/LC_MESSAGES/django.po b/wagtail/images/locale/el/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/el/LC_MESSAGES/django.po rename to wagtail/images/locale/el/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/en/LC_MESSAGES/django.mo b/wagtail/images/locale/en/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/en/LC_MESSAGES/django.mo rename to wagtail/images/locale/en/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/en/LC_MESSAGES/django.po b/wagtail/images/locale/en/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/en/LC_MESSAGES/django.po rename to wagtail/images/locale/en/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/es/LC_MESSAGES/django.mo b/wagtail/images/locale/es/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/es/LC_MESSAGES/django.mo rename to wagtail/images/locale/es/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/es/LC_MESSAGES/django.po b/wagtail/images/locale/es/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/es/LC_MESSAGES/django.po rename to wagtail/images/locale/es/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/fa/LC_MESSAGES/django.mo b/wagtail/images/locale/fa/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/fa/LC_MESSAGES/django.mo rename to wagtail/images/locale/fa/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/fa/LC_MESSAGES/django.po b/wagtail/images/locale/fa/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/fa/LC_MESSAGES/django.po rename to wagtail/images/locale/fa/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/fi/LC_MESSAGES/django.mo b/wagtail/images/locale/fi/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/fi/LC_MESSAGES/django.mo rename to wagtail/images/locale/fi/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/fi/LC_MESSAGES/django.po b/wagtail/images/locale/fi/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/fi/LC_MESSAGES/django.po rename to wagtail/images/locale/fi/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/fr/LC_MESSAGES/django.mo b/wagtail/images/locale/fr/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/fr/LC_MESSAGES/django.mo rename to wagtail/images/locale/fr/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/fr/LC_MESSAGES/django.po b/wagtail/images/locale/fr/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/fr/LC_MESSAGES/django.po rename to wagtail/images/locale/fr/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/gl/LC_MESSAGES/django.mo b/wagtail/images/locale/gl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/gl/LC_MESSAGES/django.mo rename to wagtail/images/locale/gl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/gl/LC_MESSAGES/django.po b/wagtail/images/locale/gl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/gl/LC_MESSAGES/django.po rename to wagtail/images/locale/gl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/he_IL/LC_MESSAGES/django.mo b/wagtail/images/locale/he_IL/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/he_IL/LC_MESSAGES/django.mo rename to wagtail/images/locale/he_IL/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/he_IL/LC_MESSAGES/django.po b/wagtail/images/locale/he_IL/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/he_IL/LC_MESSAGES/django.po rename to wagtail/images/locale/he_IL/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/hr_HR/LC_MESSAGES/django.mo b/wagtail/images/locale/hr_HR/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/hr_HR/LC_MESSAGES/django.mo rename to wagtail/images/locale/hr_HR/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/hr_HR/LC_MESSAGES/django.po b/wagtail/images/locale/hr_HR/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/hr_HR/LC_MESSAGES/django.po rename to wagtail/images/locale/hr_HR/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/hu/LC_MESSAGES/django.mo b/wagtail/images/locale/hu/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/hu/LC_MESSAGES/django.mo rename to wagtail/images/locale/hu/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/hu/LC_MESSAGES/django.po b/wagtail/images/locale/hu/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/hu/LC_MESSAGES/django.po rename to wagtail/images/locale/hu/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/id_ID/LC_MESSAGES/django.mo b/wagtail/images/locale/id_ID/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/id_ID/LC_MESSAGES/django.mo rename to wagtail/images/locale/id_ID/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/id_ID/LC_MESSAGES/django.po b/wagtail/images/locale/id_ID/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/id_ID/LC_MESSAGES/django.po rename to wagtail/images/locale/id_ID/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/is_IS/LC_MESSAGES/django.mo b/wagtail/images/locale/is_IS/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/is_IS/LC_MESSAGES/django.mo rename to wagtail/images/locale/is_IS/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/is_IS/LC_MESSAGES/django.po b/wagtail/images/locale/is_IS/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/is_IS/LC_MESSAGES/django.po rename to wagtail/images/locale/is_IS/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/it/LC_MESSAGES/django.mo b/wagtail/images/locale/it/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/it/LC_MESSAGES/django.mo rename to wagtail/images/locale/it/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/it/LC_MESSAGES/django.po b/wagtail/images/locale/it/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/it/LC_MESSAGES/django.po rename to wagtail/images/locale/it/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/ja/LC_MESSAGES/django.mo b/wagtail/images/locale/ja/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/ja/LC_MESSAGES/django.mo rename to wagtail/images/locale/ja/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/ja/LC_MESSAGES/django.po b/wagtail/images/locale/ja/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/ja/LC_MESSAGES/django.po rename to wagtail/images/locale/ja/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/ka/LC_MESSAGES/django.mo b/wagtail/images/locale/ka/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/ka/LC_MESSAGES/django.mo rename to wagtail/images/locale/ka/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/ka/LC_MESSAGES/django.po b/wagtail/images/locale/ka/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/ka/LC_MESSAGES/django.po rename to wagtail/images/locale/ka/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/ko/LC_MESSAGES/django.mo b/wagtail/images/locale/ko/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/ko/LC_MESSAGES/django.mo rename to wagtail/images/locale/ko/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/ko/LC_MESSAGES/django.po b/wagtail/images/locale/ko/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/ko/LC_MESSAGES/django.po rename to wagtail/images/locale/ko/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/lt/LC_MESSAGES/django.mo b/wagtail/images/locale/lt/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/lt/LC_MESSAGES/django.mo rename to wagtail/images/locale/lt/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/lt/LC_MESSAGES/django.po b/wagtail/images/locale/lt/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/lt/LC_MESSAGES/django.po rename to wagtail/images/locale/lt/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/lv/LC_MESSAGES/django.mo b/wagtail/images/locale/lv/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/lv/LC_MESSAGES/django.mo rename to wagtail/images/locale/lv/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/lv/LC_MESSAGES/django.po b/wagtail/images/locale/lv/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/lv/LC_MESSAGES/django.po rename to wagtail/images/locale/lv/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/mn/LC_MESSAGES/django.mo b/wagtail/images/locale/mn/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/mn/LC_MESSAGES/django.mo rename to wagtail/images/locale/mn/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/mn/LC_MESSAGES/django.po b/wagtail/images/locale/mn/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/mn/LC_MESSAGES/django.po rename to wagtail/images/locale/mn/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/nb/LC_MESSAGES/django.mo b/wagtail/images/locale/nb/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/nb/LC_MESSAGES/django.mo rename to wagtail/images/locale/nb/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/nb/LC_MESSAGES/django.po b/wagtail/images/locale/nb/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/nb/LC_MESSAGES/django.po rename to wagtail/images/locale/nb/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/nl/LC_MESSAGES/django.mo b/wagtail/images/locale/nl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/nl/LC_MESSAGES/django.mo rename to wagtail/images/locale/nl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/nl/LC_MESSAGES/django.po b/wagtail/images/locale/nl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/nl/LC_MESSAGES/django.po rename to wagtail/images/locale/nl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/nl_NL/LC_MESSAGES/django.mo b/wagtail/images/locale/nl_NL/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/nl_NL/LC_MESSAGES/django.mo rename to wagtail/images/locale/nl_NL/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/nl_NL/LC_MESSAGES/django.po b/wagtail/images/locale/nl_NL/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/nl_NL/LC_MESSAGES/django.po rename to wagtail/images/locale/nl_NL/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/pl/LC_MESSAGES/django.mo b/wagtail/images/locale/pl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/pl/LC_MESSAGES/django.mo rename to wagtail/images/locale/pl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/pl/LC_MESSAGES/django.po b/wagtail/images/locale/pl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/pl/LC_MESSAGES/django.po rename to wagtail/images/locale/pl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/pt_BR/LC_MESSAGES/django.mo b/wagtail/images/locale/pt_BR/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/pt_BR/LC_MESSAGES/django.mo rename to wagtail/images/locale/pt_BR/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/pt_BR/LC_MESSAGES/django.po b/wagtail/images/locale/pt_BR/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/pt_BR/LC_MESSAGES/django.po rename to wagtail/images/locale/pt_BR/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/pt_PT/LC_MESSAGES/django.mo b/wagtail/images/locale/pt_PT/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/pt_PT/LC_MESSAGES/django.mo rename to wagtail/images/locale/pt_PT/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/pt_PT/LC_MESSAGES/django.po b/wagtail/images/locale/pt_PT/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/pt_PT/LC_MESSAGES/django.po rename to wagtail/images/locale/pt_PT/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/ro/LC_MESSAGES/django.mo b/wagtail/images/locale/ro/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/ro/LC_MESSAGES/django.mo rename to wagtail/images/locale/ro/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/ro/LC_MESSAGES/django.po b/wagtail/images/locale/ro/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/ro/LC_MESSAGES/django.po rename to wagtail/images/locale/ro/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/ru/LC_MESSAGES/django.mo b/wagtail/images/locale/ru/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/ru/LC_MESSAGES/django.mo rename to wagtail/images/locale/ru/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/ru/LC_MESSAGES/django.po b/wagtail/images/locale/ru/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/ru/LC_MESSAGES/django.po rename to wagtail/images/locale/ru/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/sk_SK/LC_MESSAGES/django.mo b/wagtail/images/locale/sk_SK/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/sk_SK/LC_MESSAGES/django.mo rename to wagtail/images/locale/sk_SK/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/sk_SK/LC_MESSAGES/django.po b/wagtail/images/locale/sk_SK/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/sk_SK/LC_MESSAGES/django.po rename to wagtail/images/locale/sk_SK/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/sl/LC_MESSAGES/django.mo b/wagtail/images/locale/sl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/sl/LC_MESSAGES/django.mo rename to wagtail/images/locale/sl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/sl/LC_MESSAGES/django.po b/wagtail/images/locale/sl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/sl/LC_MESSAGES/django.po rename to wagtail/images/locale/sl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/sv/LC_MESSAGES/django.mo b/wagtail/images/locale/sv/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/sv/LC_MESSAGES/django.mo rename to wagtail/images/locale/sv/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/sv/LC_MESSAGES/django.po b/wagtail/images/locale/sv/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/sv/LC_MESSAGES/django.po rename to wagtail/images/locale/sv/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/tr/LC_MESSAGES/django.mo b/wagtail/images/locale/tr/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/tr/LC_MESSAGES/django.mo rename to wagtail/images/locale/tr/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/tr/LC_MESSAGES/django.po b/wagtail/images/locale/tr/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/tr/LC_MESSAGES/django.po rename to wagtail/images/locale/tr/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/zh/LC_MESSAGES/django.mo b/wagtail/images/locale/zh/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/zh/LC_MESSAGES/django.mo rename to wagtail/images/locale/zh/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/zh/LC_MESSAGES/django.po b/wagtail/images/locale/zh/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/zh/LC_MESSAGES/django.po rename to wagtail/images/locale/zh/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/locale/zh_CN/LC_MESSAGES/django.mo b/wagtail/images/locale/zh_CN/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailimages/locale/zh_CN/LC_MESSAGES/django.mo rename to wagtail/images/locale/zh_CN/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailimages/locale/zh_CN/LC_MESSAGES/django.po b/wagtail/images/locale/zh_CN/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailimages/locale/zh_CN/LC_MESSAGES/django.po rename to wagtail/images/locale/zh_CN/LC_MESSAGES/django.po diff --git a/wagtail/wagtailimages/migrations/0001_initial.py b/wagtail/images/migrations/0001_initial.py similarity index 96% rename from wagtail/wagtailimages/migrations/0001_initial.py rename to wagtail/images/migrations/0001_initial.py index 4040bd7db9..acabc4fa0f 100644 --- a/wagtail/wagtailimages/migrations/0001_initial.py +++ b/wagtail/images/migrations/0001_initial.py @@ -5,7 +5,7 @@ import taggit.managers from django.conf import settings from django.db import migrations, models -import wagtail.wagtailimages.models +import wagtail.images.models import wagtail.wagtailsearch.index @@ -33,7 +33,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')), ('title', models.CharField(verbose_name='Title', max_length=255)), ('file', models.ImageField( - width_field='width', upload_to=wagtail.wagtailimages.models.get_upload_to, + width_field='width', upload_to=wagtail.images.models.get_upload_to, verbose_name='File', height_field='height' )), ('width', models.IntegerField(editable=False)), diff --git a/wagtail/wagtailimages/migrations/0002_initial_data.py b/wagtail/images/migrations/0002_initial_data.py similarity index 100% rename from wagtail/wagtailimages/migrations/0002_initial_data.py rename to wagtail/images/migrations/0002_initial_data.py diff --git a/wagtail/wagtailimages/migrations/0003_fix_focal_point_fields.py b/wagtail/images/migrations/0003_fix_focal_point_fields.py similarity index 100% rename from wagtail/wagtailimages/migrations/0003_fix_focal_point_fields.py rename to wagtail/images/migrations/0003_fix_focal_point_fields.py diff --git a/wagtail/wagtailimages/migrations/0004_make_focal_point_key_not_nullable.py b/wagtail/images/migrations/0004_make_focal_point_key_not_nullable.py similarity index 100% rename from wagtail/wagtailimages/migrations/0004_make_focal_point_key_not_nullable.py rename to wagtail/images/migrations/0004_make_focal_point_key_not_nullable.py diff --git a/wagtail/wagtailimages/migrations/0005_make_filter_spec_unique.py b/wagtail/images/migrations/0005_make_filter_spec_unique.py similarity index 100% rename from wagtail/wagtailimages/migrations/0005_make_filter_spec_unique.py rename to wagtail/images/migrations/0005_make_filter_spec_unique.py diff --git a/wagtail/wagtailimages/migrations/0006_add_verbose_names.py b/wagtail/images/migrations/0006_add_verbose_names.py similarity index 100% rename from wagtail/wagtailimages/migrations/0006_add_verbose_names.py rename to wagtail/images/migrations/0006_add_verbose_names.py diff --git a/wagtail/wagtailimages/migrations/0007_image_file_size.py b/wagtail/images/migrations/0007_image_file_size.py similarity index 100% rename from wagtail/wagtailimages/migrations/0007_image_file_size.py rename to wagtail/images/migrations/0007_image_file_size.py diff --git a/wagtail/wagtailimages/migrations/0008_image_created_at_index.py b/wagtail/images/migrations/0008_image_created_at_index.py similarity index 100% rename from wagtail/wagtailimages/migrations/0008_image_created_at_index.py rename to wagtail/images/migrations/0008_image_created_at_index.py diff --git a/wagtail/wagtailimages/migrations/0009_capitalizeverbose.py b/wagtail/images/migrations/0009_capitalizeverbose.py similarity index 89% rename from wagtail/wagtailimages/migrations/0009_capitalizeverbose.py rename to wagtail/images/migrations/0009_capitalizeverbose.py index de66bcfbcf..3f4772e14a 100644 --- a/wagtail/wagtailimages/migrations/0009_capitalizeverbose.py +++ b/wagtail/images/migrations/0009_capitalizeverbose.py @@ -5,7 +5,7 @@ import taggit.managers from django.conf import settings from django.db import migrations, models -import wagtail.wagtailimages.models +import wagtail.images.models class Migration(migrations.Migration): @@ -23,7 +23,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='image', name='file', - field=models.ImageField(upload_to=wagtail.wagtailimages.models.get_upload_to, height_field='height', width_field='width', verbose_name='file'), + field=models.ImageField(upload_to=wagtail.images.models.get_upload_to, height_field='height', width_field='width', verbose_name='file'), ), migrations.AlterField( model_name='image', diff --git a/wagtail/wagtailimages/migrations/0010_change_on_delete_behaviour.py b/wagtail/images/migrations/0010_change_on_delete_behaviour.py similarity index 100% rename from wagtail/wagtailimages/migrations/0010_change_on_delete_behaviour.py rename to wagtail/images/migrations/0010_change_on_delete_behaviour.py diff --git a/wagtail/wagtailimages/migrations/0011_image_collection.py b/wagtail/images/migrations/0011_image_collection.py similarity index 100% rename from wagtail/wagtailimages/migrations/0011_image_collection.py rename to wagtail/images/migrations/0011_image_collection.py diff --git a/wagtail/wagtailimages/migrations/0012_copy_image_permissions_to_collections.py b/wagtail/images/migrations/0012_copy_image_permissions_to_collections.py similarity index 100% rename from wagtail/wagtailimages/migrations/0012_copy_image_permissions_to_collections.py rename to wagtail/images/migrations/0012_copy_image_permissions_to_collections.py diff --git a/wagtail/wagtailimages/migrations/0013_make_rendition_upload_callable.py b/wagtail/images/migrations/0013_make_rendition_upload_callable.py similarity index 67% rename from wagtail/wagtailimages/migrations/0013_make_rendition_upload_callable.py rename to wagtail/images/migrations/0013_make_rendition_upload_callable.py index 155fd894ef..803acf7d6a 100644 --- a/wagtail/wagtailimages/migrations/0013_make_rendition_upload_callable.py +++ b/wagtail/images/migrations/0013_make_rendition_upload_callable.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import wagtail.wagtailimages.models +import wagtail.images.models class Migration(migrations.Migration): @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='rendition', name='file', - field=models.ImageField(upload_to=wagtail.wagtailimages.models.get_rendition_upload_to, width_field='width', height_field='height'), + field=models.ImageField(upload_to=wagtail.images.models.get_rendition_upload_to, width_field='width', height_field='height'), ), ] diff --git a/wagtail/wagtailimages/migrations/0014_add_filter_spec_field.py b/wagtail/images/migrations/0014_add_filter_spec_field.py similarity index 100% rename from wagtail/wagtailimages/migrations/0014_add_filter_spec_field.py rename to wagtail/images/migrations/0014_add_filter_spec_field.py diff --git a/wagtail/wagtailimages/migrations/0015_fill_filter_spec_field.py b/wagtail/images/migrations/0015_fill_filter_spec_field.py similarity index 85% rename from wagtail/wagtailimages/migrations/0015_fill_filter_spec_field.py rename to wagtail/images/migrations/0015_fill_filter_spec_field.py index 651b4469e4..5531bd5860 100644 --- a/wagtail/wagtailimages/migrations/0015_fill_filter_spec_field.py +++ b/wagtail/images/migrations/0015_fill_filter_spec_field.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from django.db import migrations -from wagtail.wagtailimages.utils import get_fill_filter_spec_migrations +from wagtail.images.utils import get_fill_filter_spec_migrations class Migration(migrations.Migration): diff --git a/wagtail/wagtailimages/migrations/0016_deprecate_rendition_filter_relation.py b/wagtail/images/migrations/0016_deprecate_rendition_filter_relation.py similarity index 100% rename from wagtail/wagtailimages/migrations/0016_deprecate_rendition_filter_relation.py rename to wagtail/images/migrations/0016_deprecate_rendition_filter_relation.py diff --git a/wagtail/wagtailimages/migrations/0017_reduce_focal_point_key_max_length.py b/wagtail/images/migrations/0017_reduce_focal_point_key_max_length.py similarity index 100% rename from wagtail/wagtailimages/migrations/0017_reduce_focal_point_key_max_length.py rename to wagtail/images/migrations/0017_reduce_focal_point_key_max_length.py diff --git a/wagtail/wagtailimages/migrations/0018_remove_rendition_filter.py b/wagtail/images/migrations/0018_remove_rendition_filter.py similarity index 100% rename from wagtail/wagtailimages/migrations/0018_remove_rendition_filter.py rename to wagtail/images/migrations/0018_remove_rendition_filter.py diff --git a/wagtail/wagtailimages/migrations/0019_delete_filter.py b/wagtail/images/migrations/0019_delete_filter.py similarity index 100% rename from wagtail/wagtailimages/migrations/0019_delete_filter.py rename to wagtail/images/migrations/0019_delete_filter.py diff --git a/wagtail/wagtailimages/migrations/__init__.py b/wagtail/images/migrations/__init__.py similarity index 100% rename from wagtail/wagtailimages/migrations/__init__.py rename to wagtail/images/migrations/__init__.py diff --git a/wagtail/wagtailimages/models.py b/wagtail/images/models.py similarity index 98% rename from wagtail/wagtailimages/models.py rename to wagtail/images/models.py index b70e3dea29..5a2a48f726 100644 --- a/wagtail/wagtailimages/models.py +++ b/wagtail/images/models.py @@ -23,8 +23,8 @@ from willow.image import Image as WillowImage from wagtail.admin.utils import get_object_usage from wagtail.core import hooks from wagtail.core.models import CollectionMember -from wagtail.wagtailimages.exceptions import InvalidFilterSpecError -from wagtail.wagtailimages.rect import Rect +from wagtail.images.exceptions import InvalidFilterSpecError +from wagtail.images.rect import Rect from wagtail.wagtailsearch import index from wagtail.wagtailsearch.queryset import SearchableQuerySetMixin @@ -310,7 +310,7 @@ class AbstractImage(CollectionMember, index.Indexed, models.Model): return self.title def is_editable_by_user(self, user): - from wagtail.wagtailimages.permissions import permission_policy + from wagtail.images.permissions import permission_policy return permission_policy.user_has_permission_for_instance(user, 'change', self) class Meta: diff --git a/wagtail/wagtailimages/permissions.py b/wagtail/images/permissions.py similarity index 75% rename from wagtail/wagtailimages/permissions.py rename to wagtail/images/permissions.py index 1772c769c3..3485b4b52a 100644 --- a/wagtail/wagtailimages/permissions.py +++ b/wagtail/images/permissions.py @@ -1,8 +1,8 @@ from __future__ import absolute_import, unicode_literals from wagtail.core.permission_policies.collections import CollectionOwnershipPermissionPolicy -from wagtail.wagtailimages import get_image_model -from wagtail.wagtailimages.models import Image +from wagtail.images import get_image_model +from wagtail.images.models import Image permission_policy = CollectionOwnershipPermissionPolicy( get_image_model(), diff --git a/wagtail/wagtailimages/rect.py b/wagtail/images/rect.py similarity index 100% rename from wagtail/wagtailimages/rect.py rename to wagtail/images/rect.py diff --git a/wagtail/wagtailimages/rich_text.py b/wagtail/images/rich_text.py similarity index 92% rename from wagtail/wagtailimages/rich_text.py rename to wagtail/images/rich_text.py index 6ca57d1f53..fb6cf60d8c 100644 --- a/wagtail/wagtailimages/rich_text.py +++ b/wagtail/images/rich_text.py @@ -1,7 +1,7 @@ from __future__ import absolute_import, unicode_literals -from wagtail.wagtailimages import get_image_model -from wagtail.wagtailimages.formats import get_image_format +from wagtail.images import get_image_model +from wagtail.images.formats import get_image_format class ImageEmbedHandler(object): diff --git a/wagtail/wagtailimages/shortcuts.py b/wagtail/images/shortcuts.py similarity index 93% rename from wagtail/wagtailimages/shortcuts.py rename to wagtail/images/shortcuts.py index 9aad18dd5c..9a334e4840 100644 --- a/wagtail/wagtailimages/shortcuts.py +++ b/wagtail/images/shortcuts.py @@ -1,7 +1,7 @@ # coding=utf-8 from __future__ import absolute_import, unicode_literals -from wagtail.wagtailimages.models import SourceImageIOError +from wagtail.images.models import SourceImageIOError def get_rendition_or_not_found(image, specs): diff --git a/wagtail/wagtailimages/signal_handlers.py b/wagtail/images/signal_handlers.py similarity index 95% rename from wagtail/wagtailimages/signal_handlers.py rename to wagtail/images/signal_handlers.py index afb21f9681..a131b2f926 100644 --- a/wagtail/wagtailimages/signal_handlers.py +++ b/wagtail/images/signal_handlers.py @@ -4,7 +4,7 @@ from django.conf import settings from django.db import transaction from django.db.models.signals import post_delete, pre_save -from wagtail.wagtailimages import get_image_model +from wagtail.images import get_image_model def post_delete_file_cleanup(instance, **kwargs): diff --git a/wagtail/wagtailimages/static_src/wagtailimages/css/vendor/Jcrop.gif b/wagtail/images/static_src/wagtailimages/css/vendor/Jcrop.gif similarity index 100% rename from wagtail/wagtailimages/static_src/wagtailimages/css/vendor/Jcrop.gif rename to wagtail/images/static_src/wagtailimages/css/vendor/Jcrop.gif diff --git a/wagtail/wagtailimages/static_src/wagtailimages/css/vendor/jquery.Jcrop.min.css b/wagtail/images/static_src/wagtailimages/css/vendor/jquery.Jcrop.min.css similarity index 100% rename from wagtail/wagtailimages/static_src/wagtailimages/css/vendor/jquery.Jcrop.min.css rename to wagtail/images/static_src/wagtailimages/css/vendor/jquery.Jcrop.min.css diff --git a/wagtail/wagtailimages/static_src/wagtailimages/js/add-multiple.js b/wagtail/images/static_src/wagtailimages/js/add-multiple.js similarity index 100% rename from wagtail/wagtailimages/static_src/wagtailimages/js/add-multiple.js rename to wagtail/images/static_src/wagtailimages/js/add-multiple.js diff --git a/wagtail/wagtailimages/static_src/wagtailimages/js/focal-point-chooser.js b/wagtail/images/static_src/wagtailimages/js/focal-point-chooser.js similarity index 100% rename from wagtail/wagtailimages/static_src/wagtailimages/js/focal-point-chooser.js rename to wagtail/images/static_src/wagtailimages/js/focal-point-chooser.js diff --git a/wagtail/wagtailimages/static_src/wagtailimages/js/hallo-plugins/hallo-wagtailimage.js b/wagtail/images/static_src/wagtailimages/js/hallo-plugins/hallo-wagtailimage.js similarity index 100% rename from wagtail/wagtailimages/static_src/wagtailimages/js/hallo-plugins/hallo-wagtailimage.js rename to wagtail/images/static_src/wagtailimages/js/hallo-plugins/hallo-wagtailimage.js diff --git a/wagtail/wagtailimages/static_src/wagtailimages/js/image-chooser.js b/wagtail/images/static_src/wagtailimages/js/image-chooser.js similarity index 100% rename from wagtail/wagtailimages/static_src/wagtailimages/js/image-chooser.js rename to wagtail/images/static_src/wagtailimages/js/image-chooser.js diff --git a/wagtail/wagtailimages/static_src/wagtailimages/js/image-url-generator.js b/wagtail/images/static_src/wagtailimages/js/image-url-generator.js similarity index 100% rename from wagtail/wagtailimages/static_src/wagtailimages/js/image-url-generator.js rename to wagtail/images/static_src/wagtailimages/js/image-url-generator.js diff --git a/wagtail/wagtailimages/static_src/wagtailimages/js/vendor/canvas-to-blob.min.js b/wagtail/images/static_src/wagtailimages/js/vendor/canvas-to-blob.min.js similarity index 100% rename from wagtail/wagtailimages/static_src/wagtailimages/js/vendor/canvas-to-blob.min.js rename to wagtail/images/static_src/wagtailimages/js/vendor/canvas-to-blob.min.js diff --git a/wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.Jcrop.min.js b/wagtail/images/static_src/wagtailimages/js/vendor/jquery.Jcrop.min.js similarity index 100% rename from wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.Jcrop.min.js rename to wagtail/images/static_src/wagtailimages/js/vendor/jquery.Jcrop.min.js diff --git a/wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.fileupload-image.js b/wagtail/images/static_src/wagtailimages/js/vendor/jquery.fileupload-image.js similarity index 100% rename from wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.fileupload-image.js rename to wagtail/images/static_src/wagtailimages/js/vendor/jquery.fileupload-image.js diff --git a/wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.fileupload-validate.js b/wagtail/images/static_src/wagtailimages/js/vendor/jquery.fileupload-validate.js similarity index 100% rename from wagtail/wagtailimages/static_src/wagtailimages/js/vendor/jquery.fileupload-validate.js rename to wagtail/images/static_src/wagtailimages/js/vendor/jquery.fileupload-validate.js diff --git a/wagtail/wagtailimages/static_src/wagtailimages/js/vendor/load-image.min.js b/wagtail/images/static_src/wagtailimages/js/vendor/load-image.min.js similarity index 100% rename from wagtail/wagtailimages/static_src/wagtailimages/js/vendor/load-image.min.js rename to wagtail/images/static_src/wagtailimages/js/vendor/load-image.min.js diff --git a/wagtail/wagtailimages/static_src/wagtailimages/scss/add-multiple.scss b/wagtail/images/static_src/wagtailimages/scss/add-multiple.scss similarity index 100% rename from wagtail/wagtailimages/static_src/wagtailimages/scss/add-multiple.scss rename to wagtail/images/static_src/wagtailimages/scss/add-multiple.scss diff --git a/wagtail/wagtailimages/static_src/wagtailimages/scss/focal-point-chooser.scss b/wagtail/images/static_src/wagtailimages/scss/focal-point-chooser.scss similarity index 100% rename from wagtail/wagtailimages/static_src/wagtailimages/scss/focal-point-chooser.scss rename to wagtail/images/static_src/wagtailimages/scss/focal-point-chooser.scss diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html b/wagtail/images/templates/wagtailimages/chooser/chooser.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html rename to wagtail/images/templates/wagtailimages/chooser/chooser.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.js b/wagtail/images/templates/wagtailimages/chooser/chooser.js similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.js rename to wagtail/images/templates/wagtailimages/chooser/chooser.js diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/image_chosen.js b/wagtail/images/templates/wagtailimages/chooser/image_chosen.js similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/chooser/image_chosen.js rename to wagtail/images/templates/wagtailimages/chooser/image_chosen.js diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/results.html b/wagtail/images/templates/wagtailimages/chooser/results.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/chooser/results.html rename to wagtail/images/templates/wagtailimages/chooser/results.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html b/wagtail/images/templates/wagtailimages/chooser/select_format.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html rename to wagtail/images/templates/wagtailimages/chooser/select_format.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.js b/wagtail/images/templates/wagtailimages/chooser/select_format.js similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.js rename to wagtail/images/templates/wagtailimages/chooser/select_format.js diff --git a/wagtail/wagtailimages/templates/wagtailimages/edit_handlers/image_chooser_panel.html b/wagtail/images/templates/wagtailimages/edit_handlers/image_chooser_panel.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/edit_handlers/image_chooser_panel.html rename to wagtail/images/templates/wagtailimages/edit_handlers/image_chooser_panel.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/homepage/site_summary_images.html b/wagtail/images/templates/wagtailimages/homepage/site_summary_images.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/homepage/site_summary_images.html rename to wagtail/images/templates/wagtailimages/homepage/site_summary_images.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/_file_field.html b/wagtail/images/templates/wagtailimages/images/_file_field.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/images/_file_field.html rename to wagtail/images/templates/wagtailimages/images/_file_field.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/_file_field_as_li.html b/wagtail/images/templates/wagtailimages/images/_file_field_as_li.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/images/_file_field_as_li.html rename to wagtail/images/templates/wagtailimages/images/_file_field_as_li.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/add.html b/wagtail/images/templates/wagtailimages/images/add.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/images/add.html rename to wagtail/images/templates/wagtailimages/images/add.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html b/wagtail/images/templates/wagtailimages/images/confirm_delete.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html rename to wagtail/images/templates/wagtailimages/images/confirm_delete.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html b/wagtail/images/templates/wagtailimages/images/edit.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/images/edit.html rename to wagtail/images/templates/wagtailimages/images/edit.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/index.html b/wagtail/images/templates/wagtailimages/images/index.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/images/index.html rename to wagtail/images/templates/wagtailimages/images/index.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/results.html b/wagtail/images/templates/wagtailimages/images/results.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/images/results.html rename to wagtail/images/templates/wagtailimages/images/results.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/results_image.html b/wagtail/images/templates/wagtailimages/images/results_image.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/images/results_image.html rename to wagtail/images/templates/wagtailimages/images/results_image.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html b/wagtail/images/templates/wagtailimages/images/url_generator.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html rename to wagtail/images/templates/wagtailimages/images/url_generator.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/usage.html b/wagtail/images/templates/wagtailimages/images/usage.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/images/usage.html rename to wagtail/images/templates/wagtailimages/images/usage.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/multiple/add.html b/wagtail/images/templates/wagtailimages/multiple/add.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/multiple/add.html rename to wagtail/images/templates/wagtailimages/multiple/add.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/multiple/edit_form.html b/wagtail/images/templates/wagtailimages/multiple/edit_form.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/multiple/edit_form.html rename to wagtail/images/templates/wagtailimages/multiple/edit_form.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/permissions/includes/image_permissions_formset.html b/wagtail/images/templates/wagtailimages/permissions/includes/image_permissions_formset.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/permissions/includes/image_permissions_formset.html rename to wagtail/images/templates/wagtailimages/permissions/includes/image_permissions_formset.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/widgets/compare.html b/wagtail/images/templates/wagtailimages/widgets/compare.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/widgets/compare.html rename to wagtail/images/templates/wagtailimages/widgets/compare.html diff --git a/wagtail/wagtailimages/templates/wagtailimages/widgets/image_chooser.html b/wagtail/images/templates/wagtailimages/widgets/image_chooser.html similarity index 100% rename from wagtail/wagtailimages/templates/wagtailimages/widgets/image_chooser.html rename to wagtail/images/templates/wagtailimages/widgets/image_chooser.html diff --git a/wagtail/wagtailimages/templatetags/__init__.py b/wagtail/images/templatetags/__init__.py similarity index 100% rename from wagtail/wagtailimages/templatetags/__init__.py rename to wagtail/images/templatetags/__init__.py diff --git a/wagtail/wagtailimages/templatetags/wagtailimages_tags.py b/wagtail/images/templatetags/wagtailimages_tags.py similarity index 96% rename from wagtail/wagtailimages/templatetags/wagtailimages_tags.py rename to wagtail/images/templatetags/wagtailimages_tags.py index 2ab47915e7..39842aa567 100644 --- a/wagtail/wagtailimages/templatetags/wagtailimages_tags.py +++ b/wagtail/images/templatetags/wagtailimages_tags.py @@ -5,8 +5,8 @@ import re from django import template from django.utils.functional import cached_property -from wagtail.wagtailimages.models import Filter -from wagtail.wagtailimages.shortcuts import get_rendition_or_not_found +from wagtail.images.models import Filter +from wagtail.images.shortcuts import get_rendition_or_not_found register = template.Library() allowed_filter_pattern = re.compile("^[A-Za-z0-9_\-\.]+$") diff --git a/wagtail/wagtailimages/tests/__init__.py b/wagtail/images/tests/__init__.py similarity index 100% rename from wagtail/wagtailimages/tests/__init__.py rename to wagtail/images/tests/__init__.py diff --git a/wagtail/wagtailimages/tests/test_admin_views.py b/wagtail/images/tests/test_admin_views.py similarity index 99% rename from wagtail/wagtailimages/tests/test_admin_views.py rename to wagtail/images/tests/test_admin_views.py index 41799e30cb..f2c76cbb97 100644 --- a/wagtail/wagtailimages/tests/test_admin_views.py +++ b/wagtail/images/tests/test_admin_views.py @@ -12,7 +12,7 @@ from django.utils.http import RFC3986_SUBDELIMS, urlquote from wagtail.tests.utils import WagtailTestUtils from wagtail.core.models import Collection, GroupCollectionPermission -from wagtail.wagtailimages.views.serve import generate_signature +from wagtail.images.views.serve import generate_signature from .utils import Image, get_test_image_file diff --git a/wagtail/wagtailimages/tests/test_blocks.py b/wagtail/images/tests/test_blocks.py similarity index 96% rename from wagtail/wagtailimages/tests/test_blocks.py rename to wagtail/images/tests/test_blocks.py index 2c872fabc1..58d31f2088 100644 --- a/wagtail/wagtailimages/tests/test_blocks.py +++ b/wagtail/images/tests/test_blocks.py @@ -7,7 +7,7 @@ from django.conf import settings from django.core import serializers from django.test import TestCase -from wagtail.wagtailimages.blocks import ImageChooserBlock +from wagtail.images.blocks import ImageChooserBlock from .utils import Image, get_test_image_file diff --git a/wagtail/wagtailimages/tests/test_image_operations.py b/wagtail/images/tests/test_image_operations.py similarity index 98% rename from wagtail/wagtailimages/tests/test_image_operations.py rename to wagtail/images/tests/test_image_operations.py index cbb86167a9..ff36881335 100644 --- a/wagtail/wagtailimages/tests/test_image_operations.py +++ b/wagtail/images/tests/test_image_operations.py @@ -6,10 +6,10 @@ from django.test import TestCase, override_settings from mock import Mock, patch from wagtail.core import hooks -from wagtail.wagtailimages import image_operations -from wagtail.wagtailimages.exceptions import InvalidFilterSpecError -from wagtail.wagtailimages.models import Filter, Image -from wagtail.wagtailimages.tests.utils import get_test_image_file, get_test_image_file_jpeg +from wagtail.images import image_operations +from wagtail.images.exceptions import InvalidFilterSpecError +from wagtail.images.models import Filter, Image +from wagtail.images.tests.utils import get_test_image_file, get_test_image_file_jpeg class WillowOperationRecorder(object): diff --git a/wagtail/wagtailimages/tests/test_jinja2.py b/wagtail/images/tests/test_jinja2.py similarity index 100% rename from wagtail/wagtailimages/tests/test_jinja2.py rename to wagtail/images/tests/test_jinja2.py diff --git a/wagtail/wagtailimages/tests/test_models.py b/wagtail/images/tests/test_models.py similarity index 99% rename from wagtail/wagtailimages/tests/test_models.py rename to wagtail/images/tests/test_models.py index 5cdb5fcf58..614718261b 100644 --- a/wagtail/wagtailimages/tests/test_models.py +++ b/wagtail/images/tests/test_models.py @@ -14,8 +14,8 @@ from willow.image import Image as WillowImage from wagtail.tests.testapp.models import EventPage, EventPageCarouselItem from wagtail.tests.utils import WagtailTestUtils from wagtail.core.models import Collection, GroupCollectionPermission, Page -from wagtail.wagtailimages.models import Rendition, SourceImageIOError -from wagtail.wagtailimages.rect import Rect +from wagtail.images.models import Rendition, SourceImageIOError +from wagtail.images.rect import Rect from .utils import Image, get_test_image_file diff --git a/wagtail/wagtailimages/tests/test_rich_text.py b/wagtail/images/tests/test_rich_text.py similarity index 96% rename from wagtail/wagtailimages/tests/test_rich_text.py rename to wagtail/images/tests/test_rich_text.py index 318f24a183..b16b7fd046 100644 --- a/wagtail/wagtailimages/tests/test_rich_text.py +++ b/wagtail/images/tests/test_rich_text.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from bs4 import BeautifulSoup from django.test import TestCase -from wagtail.wagtailimages.rich_text import ImageEmbedHandler +from wagtail.images.rich_text import ImageEmbedHandler from .utils import Image, get_test_image_file diff --git a/wagtail/wagtailimages/tests/test_shortcuts.py b/wagtail/images/tests/test_shortcuts.py similarity index 90% rename from wagtail/wagtailimages/tests/test_shortcuts.py rename to wagtail/images/tests/test_shortcuts.py index d42c595650..9ad7c13f8d 100644 --- a/wagtail/wagtailimages/tests/test_shortcuts.py +++ b/wagtail/images/tests/test_shortcuts.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.test import TestCase -from wagtail.wagtailimages.shortcuts import get_rendition_or_not_found +from wagtail.images.shortcuts import get_rendition_or_not_found from .utils import Image, get_test_image_file diff --git a/wagtail/wagtailimages/tests/test_signal_handlers.py b/wagtail/images/tests/test_signal_handlers.py similarity index 96% rename from wagtail/wagtailimages/tests/test_signal_handlers.py rename to wagtail/images/tests/test_signal_handlers.py index 3ea115f108..8c2b6b9670 100644 --- a/wagtail/wagtailimages/tests/test_signal_handlers.py +++ b/wagtail/images/tests/test_signal_handlers.py @@ -4,8 +4,8 @@ from django.db import transaction from django.test import TransactionTestCase, override_settings from wagtail.core.models import Collection -from wagtail.wagtailimages import get_image_model, signal_handlers -from wagtail.wagtailimages.tests.utils import get_test_image_file +from wagtail.images import get_image_model, signal_handlers +from wagtail.images.tests.utils import get_test_image_file class TestFilesDeletedForDefaultModels(TransactionTestCase): diff --git a/wagtail/wagtailimages/tests/tests.py b/wagtail/images/tests/tests.py similarity index 97% rename from wagtail/wagtailimages/tests/tests.py rename to wagtail/images/tests/tests.py index 20f9582266..64d1de9011 100644 --- a/wagtail/wagtailimages/tests/tests.py +++ b/wagtail/images/tests/tests.py @@ -14,13 +14,13 @@ from taggit.forms import TagField, TagWidget from wagtail.tests.testapp.models import CustomImage, CustomImageFilePath from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailimages import get_image_model, get_image_model_string -from wagtail.wagtailimages.fields import WagtailImageField -from wagtail.wagtailimages.formats import Format, get_image_format, register_image_format -from wagtail.wagtailimages.forms import get_image_form -from wagtail.wagtailimages.models import Image as WagtailImage -from wagtail.wagtailimages.rect import Rect, Vector -from wagtail.wagtailimages.views.serve import ServeView, generate_signature, verify_signature +from wagtail.images import get_image_model, get_image_model_string +from wagtail.images.fields import WagtailImageField +from wagtail.images.formats import Format, get_image_format, register_image_format +from wagtail.images.forms import get_image_form +from wagtail.images.models import Image as WagtailImage +from wagtail.images.rect import Rect, Vector +from wagtail.images.views.serve import ServeView, generate_signature, verify_signature from .utils import Image, get_test_image_file @@ -626,7 +626,7 @@ class TestGetImageModel(WagtailTestUtils, TestCase): def test_standard_get_image_model(self): """Test get_image_model with no WAGTAILIMAGES_IMAGE_MODEL""" del settings.WAGTAILIMAGES_IMAGE_MODEL - from wagtail.wagtailimages.models import Image + from wagtail.images.models import Image self.assertIs(get_image_model(), Image) @override_settings() diff --git a/wagtail/wagtailimages/tests/urls.py b/wagtail/images/tests/urls.py similarity index 91% rename from wagtail/wagtailimages/tests/urls.py rename to wagtail/images/tests/urls.py index 00b17b6bcc..0063694042 100644 --- a/wagtail/wagtailimages/tests/urls.py +++ b/wagtail/images/tests/urls.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import url from wagtail.tests import dummy_sendfile_backend -from wagtail.wagtailimages.views.serve import SendFileView, ServeView +from wagtail.images.views.serve import SendFileView, ServeView urlpatterns = [ url(r'^actions/serve/(.*)/(\d*)/(.*)/[^/]*', ServeView.as_view(action='serve'), name='wagtailimages_serve_action_serve'), diff --git a/wagtail/wagtailimages/tests/utils.py b/wagtail/images/tests/utils.py similarity index 92% rename from wagtail/wagtailimages/tests/utils.py rename to wagtail/images/tests/utils.py index a12d41e6b7..d8279a0495 100644 --- a/wagtail/wagtailimages/tests/utils.py +++ b/wagtail/images/tests/utils.py @@ -5,7 +5,7 @@ from io import BytesIO import PIL.Image from django.core.files.images import ImageFile -from wagtail.wagtailimages import get_image_model +from wagtail.images import get_image_model Image = get_image_model() diff --git a/wagtail/wagtailimages/urls.py b/wagtail/images/urls.py similarity index 78% rename from wagtail/wagtailimages/urls.py rename to wagtail/images/urls.py index ac52a97294..31507e9e72 100644 --- a/wagtail/wagtailimages/urls.py +++ b/wagtail/images/urls.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import url -from wagtail.wagtailimages.views.serve import serve +from wagtail.images.views.serve import serve urlpatterns = [ url(r'^([^/]*)/(\d*)/([^/]*)/[^/]*$', serve, name='wagtailimages_serve'), diff --git a/wagtail/wagtailimages/utils.py b/wagtail/images/utils.py similarity index 100% rename from wagtail/wagtailimages/utils.py rename to wagtail/images/utils.py diff --git a/wagtail/wagtailimages/views/__init__.py b/wagtail/images/views/__init__.py similarity index 100% rename from wagtail/wagtailimages/views/__init__.py rename to wagtail/images/views/__init__.py diff --git a/wagtail/wagtailimages/views/chooser.py b/wagtail/images/views/chooser.py similarity index 96% rename from wagtail/wagtailimages/views/chooser.py rename to wagtail/images/views/chooser.py index ec227799f2..d173f5e477 100644 --- a/wagtail/wagtailimages/views/chooser.py +++ b/wagtail/images/views/chooser.py @@ -11,10 +11,10 @@ from wagtail.admin.modal_workflow import render_modal_workflow from wagtail.admin.utils import PermissionPolicyChecker, popular_tags_for_model from wagtail.core import hooks from wagtail.core.models import Collection -from wagtail.wagtailimages import get_image_model -from wagtail.wagtailimages.formats import get_image_format -from wagtail.wagtailimages.forms import ImageInsertionForm, get_image_form -from wagtail.wagtailimages.permissions import permission_policy +from wagtail.images import get_image_model +from wagtail.images.formats import get_image_format +from wagtail.images.forms import ImageInsertionForm, get_image_form +from wagtail.images.permissions import permission_policy from wagtail.wagtailsearch import index as search_index permission_checker = PermissionPolicyChecker(permission_policy) diff --git a/wagtail/wagtailimages/views/images.py b/wagtail/images/views/images.py similarity index 96% rename from wagtail/wagtailimages/views/images.py rename to wagtail/images/views/images.py index cfc14ce7b7..4d8a87c11f 100644 --- a/wagtail/wagtailimages/views/images.py +++ b/wagtail/images/views/images.py @@ -15,12 +15,12 @@ from wagtail.admin.forms import SearchForm from wagtail.admin.utils import ( PermissionPolicyChecker, permission_denied, popular_tags_for_model) from wagtail.core.models import Collection, Site -from wagtail.wagtailimages import get_image_model -from wagtail.wagtailimages.exceptions import InvalidFilterSpecError -from wagtail.wagtailimages.forms import URLGeneratorForm, get_image_form -from wagtail.wagtailimages.models import Filter -from wagtail.wagtailimages.permissions import permission_policy -from wagtail.wagtailimages.views.serve import generate_signature +from wagtail.images import get_image_model +from wagtail.images.exceptions import InvalidFilterSpecError +from wagtail.images.forms import URLGeneratorForm, get_image_form +from wagtail.images.models import Filter +from wagtail.images.permissions import permission_policy +from wagtail.images.views.serve import generate_signature from wagtail.wagtailsearch import index as search_index permission_checker = PermissionPolicyChecker(permission_policy) diff --git a/wagtail/wagtailimages/views/multiple.py b/wagtail/images/views/multiple.py similarity index 95% rename from wagtail/wagtailimages/views/multiple.py rename to wagtail/images/views/multiple.py index 36fd33ff6f..b253cd4d33 100644 --- a/wagtail/wagtailimages/views/multiple.py +++ b/wagtail/images/views/multiple.py @@ -9,10 +9,10 @@ from django.views.decorators.http import require_POST from django.views.decorators.vary import vary_on_headers from wagtail.admin.utils import PermissionPolicyChecker -from wagtail.wagtailimages import get_image_model -from wagtail.wagtailimages.fields import ALLOWED_EXTENSIONS -from wagtail.wagtailimages.forms import get_image_form -from wagtail.wagtailimages.permissions import permission_policy +from wagtail.images import get_image_model +from wagtail.images.fields import ALLOWED_EXTENSIONS +from wagtail.images.forms import get_image_form +from wagtail.images.permissions import permission_policy from wagtail.wagtailsearch.backends import get_search_backends permission_checker = PermissionPolicyChecker(permission_policy) diff --git a/wagtail/wagtailimages/views/serve.py b/wagtail/images/views/serve.py similarity index 94% rename from wagtail/wagtailimages/views/serve.py rename to wagtail/images/views/serve.py index c842c0b435..59077522c8 100644 --- a/wagtail/wagtailimages/views/serve.py +++ b/wagtail/images/views/serve.py @@ -14,9 +14,9 @@ from django.utils.decorators import classonlymethod from django.views.generic import View from wagtail.utils.sendfile import sendfile -from wagtail.wagtailimages import get_image_model -from wagtail.wagtailimages.exceptions import InvalidFilterSpecError -from wagtail.wagtailimages.models import SourceImageIOError +from wagtail.images import get_image_model +from wagtail.images.exceptions import InvalidFilterSpecError +from wagtail.images.models import SourceImageIOError def generate_signature(image_id, filter_spec, key=None): diff --git a/wagtail/wagtailimages/wagtail_hooks.py b/wagtail/images/wagtail_hooks.py similarity index 92% rename from wagtail/wagtailimages/wagtail_hooks.py rename to wagtail/images/wagtail_hooks.py index 3e6f4325fa..052966865a 100644 --- a/wagtail/wagtailimages/wagtail_hooks.py +++ b/wagtail/images/wagtail_hooks.py @@ -12,11 +12,11 @@ from wagtail.admin.rich_text import HalloPlugin from wagtail.admin.search import SearchArea from wagtail.admin.site_summary import SummaryItem from wagtail.core import hooks -from wagtail.wagtailimages import admin_urls, get_image_model, image_operations -from wagtail.wagtailimages.api.admin.endpoints import ImagesAdminAPIEndpoint -from wagtail.wagtailimages.forms import GroupImagePermissionFormSet -from wagtail.wagtailimages.permissions import permission_policy -from wagtail.wagtailimages.rich_text import ImageEmbedHandler +from wagtail.images import admin_urls, get_image_model, image_operations +from wagtail.images.api.admin.endpoints import ImagesAdminAPIEndpoint +from wagtail.images.forms import GroupImagePermissionFormSet +from wagtail.images.permissions import permission_policy +from wagtail.images.rich_text import ImageEmbedHandler @hooks.register('register_admin_urls') diff --git a/wagtail/wagtailimages/widgets.py b/wagtail/images/widgets.py similarity index 95% rename from wagtail/wagtailimages/widgets.py rename to wagtail/images/widgets.py index 465b23983c..e941b8bd50 100644 --- a/wagtail/wagtailimages/widgets.py +++ b/wagtail/images/widgets.py @@ -6,7 +6,7 @@ from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ from wagtail.admin.widgets import AdminChooser -from wagtail.wagtailimages import get_image_model +from wagtail.images import get_image_model class AdminImageChooser(AdminChooser): diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py index 1229387279..45fe7315b5 100644 --- a/wagtail/project_template/project_name/settings/base.py +++ b/wagtail/project_template/project_name/settings/base.py @@ -36,7 +36,7 @@ INSTALLED_APPS = [ 'wagtail.wagtailusers', 'wagtail.wagtailsnippets', 'wagtail.documents', - 'wagtail.wagtailimages', + 'wagtail.images', 'wagtail.wagtailsearch', 'wagtail.admin', 'wagtail.core', diff --git a/wagtail/tests/demosite/models.py b/wagtail/tests/demosite/models.py index e8aed7743e..01b6e2b81e 100644 --- a/wagtail/tests/demosite/models.py +++ b/wagtail/tests/demosite/models.py @@ -14,8 +14,8 @@ from wagtail.admin.edit_handlers import ( from wagtail.core.fields import RichTextField from wagtail.core.models import Orderable, Page from wagtail.documents.edit_handlers import DocumentChooserPanel -from wagtail.wagtailimages.api.fields import ImageRenditionField -from wagtail.wagtailimages.edit_handlers import ImageChooserPanel +from wagtail.images.api.fields import ImageRenditionField +from wagtail.images.edit_handlers import ImageChooserPanel from wagtail.wagtailsearch import index diff --git a/wagtail/tests/non_root_urls.py b/wagtail/tests/non_root_urls.py index 7b761188ff..cf744af4b4 100644 --- a/wagtail/tests/non_root_urls.py +++ b/wagtail/tests/non_root_urls.py @@ -8,7 +8,7 @@ from django.conf.urls import include, url 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.wagtailimages import urls as wagtailimages_urls +from wagtail.images import urls as wagtailimages_urls from wagtail.wagtailsearch import urls as wagtailsearch_urls urlpatterns = [ diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py index 5f73eabe39..35ea05c79a 100644 --- a/wagtail/tests/settings.py +++ b/wagtail/tests/settings.py @@ -79,7 +79,7 @@ TEMPLATES = [ 'extensions': [ 'wagtail.core.jinja2tags.core', 'wagtail.admin.jinja2tags.userbar', - 'wagtail.wagtailimages.jinja2tags.images', + 'wagtail.images.jinja2tags.images', 'wagtail.contrib.settings.jinja2tags.settings', ], }, @@ -121,7 +121,7 @@ INSTALLED_APPS = ( 'wagtail.wagtailforms', 'wagtail.wagtailsearch', 'wagtail.embeds', - 'wagtail.wagtailimages', + 'wagtail.images', 'wagtail.wagtailsites', 'wagtail.wagtailusers', 'wagtail.wagtailsnippets', diff --git a/wagtail/tests/testapp/migrations/0001_initial.py b/wagtail/tests/testapp/migrations/0001_initial.py index 44ef2a7f1b..3c3f5a8e85 100644 --- a/wagtail/tests/testapp/migrations/0001_initial.py +++ b/wagtail/tests/testapp/migrations/0001_initial.py @@ -11,8 +11,8 @@ from django.db import migrations, models import wagtail.core.blocks import wagtail.core.fields -import wagtail.wagtailimages.blocks -import wagtail.wagtailimages.models +import wagtail.images.blocks +import wagtail.images.models import wagtail.wagtailsearch.index @@ -128,7 +128,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('title', models.CharField(max_length=255, verbose_name='title')), - ('file', models.ImageField(height_field='height', upload_to=wagtail.wagtailimages.models.get_upload_to, verbose_name='file', width_field='width')), + ('file', models.ImageField(height_field='height', upload_to=wagtail.images.models.get_upload_to, verbose_name='file', width_field='width')), ('width', models.IntegerField(editable=False, verbose_name='width')), ('height', models.IntegerField(editable=False, verbose_name='height')), ('created_at', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='created at')), @@ -152,7 +152,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('title', models.CharField(max_length=255, verbose_name='title')), - ('file', models.ImageField(height_field='height', upload_to=wagtail.wagtailimages.models.get_upload_to, verbose_name='file', width_field='width')), + ('file', models.ImageField(height_field='height', upload_to=wagtail.images.models.get_upload_to, verbose_name='file', width_field='width')), ('width', models.IntegerField(editable=False, verbose_name='width')), ('height', models.IntegerField(editable=False, verbose_name='height')), ('created_at', models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='created at')), @@ -436,14 +436,14 @@ class Migration(migrations.Migration): name='StreamModel', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('body', wagtail.core.fields.StreamField((('text', wagtail.core.blocks.CharBlock()), ('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())))), + ('body', wagtail.core.fields.StreamField((('text', wagtail.core.blocks.CharBlock()), ('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())))), ], ), migrations.CreateModel( name='StreamPage', 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')), - ('body', wagtail.core.fields.StreamField((('text', wagtail.core.blocks.CharBlock()), ('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())))), + ('body', wagtail.core.fields.StreamField((('text', wagtail.core.blocks.CharBlock()), ('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())))), ], options={ 'abstract': False, diff --git a/wagtail/tests/testapp/migrations/0008_inlinestreampage_inlinestreampagesection.py b/wagtail/tests/testapp/migrations/0008_inlinestreampage_inlinestreampagesection.py index 01f1d18dc2..fa5800c584 100644 --- a/wagtail/tests/testapp/migrations/0008_inlinestreampage_inlinestreampagesection.py +++ b/wagtail/tests/testapp/migrations/0008_inlinestreampage_inlinestreampagesection.py @@ -7,7 +7,7 @@ import django.db.models.deletion import modelcluster.fields import wagtail.core.blocks import wagtail.core.fields -import wagtail.wagtailimages.blocks +import wagtail.images.blocks class Migration(migrations.Migration): @@ -33,7 +33,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), - ('body', wagtail.core.fields.StreamField((('text', wagtail.core.blocks.CharBlock()), ('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())))), + ('body', wagtail.core.fields.StreamField((('text', wagtail.core.blocks.CharBlock()), ('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())))), ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='sections', to='tests.InlineStreamPage')), ], options={ diff --git a/wagtail/tests/testapp/migrations/0009_defaultstreampage.py b/wagtail/tests/testapp/migrations/0009_defaultstreampage.py index a2689576da..a115c0556b 100644 --- a/wagtail/tests/testapp/migrations/0009_defaultstreampage.py +++ b/wagtail/tests/testapp/migrations/0009_defaultstreampage.py @@ -6,7 +6,7 @@ from django.db import migrations, models import django.db.models.deletion import wagtail.core.blocks import wagtail.core.fields -import wagtail.wagtailimages.blocks +import wagtail.images.blocks class Migration(migrations.Migration): @@ -21,7 +21,7 @@ class Migration(migrations.Migration): name='DefaultStreamPage', 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')), - ('body', wagtail.core.fields.StreamField((('text', wagtail.core.blocks.CharBlock()), ('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())), default='')), + ('body', wagtail.core.fields.StreamField((('text', wagtail.core.blocks.CharBlock()), ('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())), default='')), ], options={ 'abstract': False, diff --git a/wagtail/tests/testapp/migrations/0015_auto_20170210_2058.py b/wagtail/tests/testapp/migrations/0015_auto_20170210_2058.py index 6b6e261bc9..e17acc4401 100644 --- a/wagtail/tests/testapp/migrations/0015_auto_20170210_2058.py +++ b/wagtail/tests/testapp/migrations/0015_auto_20170210_2058.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion -import wagtail.wagtailimages.models +import wagtail.images.models class Migration(migrations.Migration): @@ -19,7 +19,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('filter_spec', models.CharField(db_index=True, max_length=255)), - ('file', models.ImageField(height_field='height', upload_to=wagtail.wagtailimages.models.get_rendition_upload_to, width_field='width')), + ('file', models.ImageField(height_field='height', upload_to=wagtail.images.models.get_rendition_upload_to, width_field='width')), ('width', models.IntegerField(editable=False)), ('height', models.IntegerField(editable=False)), ('focal_point_key', models.CharField(blank=True, default='', editable=False, max_length=16)), diff --git a/wagtail/tests/testapp/models.py b/wagtail/tests/testapp/models.py index 6683185f3a..22813fd9e6 100644 --- a/wagtail/tests/testapp/models.py +++ b/wagtail/tests/testapp/models.py @@ -30,9 +30,9 @@ from wagtail.core.models import Orderable, Page, PageManager, PageQuerySet from wagtail.documents.edit_handlers import DocumentChooserPanel from wagtail.documents.models import AbstractDocument, Document from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField, AbstractFormSubmission -from wagtail.wagtailimages.blocks import ImageChooserBlock -from wagtail.wagtailimages.edit_handlers import ImageChooserPanel -from wagtail.wagtailimages.models import AbstractImage, AbstractRendition, Image +from wagtail.images.blocks import ImageChooserBlock +from wagtail.images.edit_handlers import ImageChooserPanel +from wagtail.images.models import AbstractImage, AbstractRendition, Image from wagtail.wagtailsearch import index from wagtail.wagtailsnippets.edit_handlers import SnippetChooserPanel from wagtail.wagtailsnippets.models import register_snippet diff --git a/wagtail/tests/urls.py b/wagtail/tests/urls.py index e94e651661..29d2b4ce84 100644 --- a/wagtail/tests/urls.py +++ b/wagtail/tests/urls.py @@ -11,9 +11,9 @@ 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.documents.api.v2.endpoints import DocumentsAPIEndpoint -from wagtail.wagtailimages import urls as wagtailimages_urls -from wagtail.wagtailimages.api.v2.endpoints import ImagesAPIEndpoint -from wagtail.wagtailimages.tests import urls as wagtailimages_test_urls +from wagtail.images import urls as wagtailimages_urls +from wagtail.images.api.v2.endpoints import ImagesAPIEndpoint +from wagtail.images.tests import urls as wagtailimages_test_urls from wagtail.wagtailsearch import urls as wagtailsearch_urls api_router = WagtailAPIRouter('wagtailapi_v2')