diff --git a/.tx/config b/.tx/config index 9538a2b2b7..5b098dc84a 100644 --- a/.tx/config +++ b/.tx/config @@ -38,8 +38,8 @@ source_lang = en type = PO [wagtail.wagtailsearch] -file_filter = wagtail/wagtailsearch/locale//LC_MESSAGES/django.po -source_file = wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.po +file_filter = wagtail/search/locale//LC_MESSAGES/django.po +source_file = wagtail/search/locale/en/LC_MESSAGES/django.po source_lang = en type = PO diff --git a/docs/advanced_topics/settings.rst b/docs/advanced_topics/settings.rst index 2461de9719..248b177e45 100644 --- a/docs/advanced_topics/settings.rst +++ b/docs/advanced_topics/settings.rst @@ -68,7 +68,7 @@ Apps (``settings.py``) 'wagtail.wagtailsnippets', 'wagtail.documents', 'wagtail.images', - 'wagtail.wagtailsearch', + 'wagtail.search', 'wagtail.admin', 'wagtail.core', @@ -179,7 +179,7 @@ Search WAGTAILSEARCH_BACKENDS = { 'default': { - 'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch2', + 'BACKEND': 'wagtail.search.backends.elasticsearch2', 'INDEX': 'myapp' } } @@ -450,7 +450,7 @@ URL Patterns from wagtail.core import urls as wagtail_urls from wagtail.admin import urls as wagtailadmin_urls from wagtail.documents import urls as wagtaildocs_urls - from wagtail.wagtailsearch import urls as wagtailsearch_urls + from wagtail.search import urls as wagtailsearch_urls urlpatterns = [ url(r'^django-admin/', include(admin.site.urls)), @@ -510,7 +510,7 @@ These two files should reside in your project directory (``myproject/myproject/` 'wagtail.wagtailsnippets', 'wagtail.documents', 'wagtail.images', - 'wagtail.wagtailsearch', + 'wagtail.search', 'wagtail.admin', 'wagtail.core', @@ -663,7 +663,7 @@ These two files should reside in your project directory (``myproject/myproject/` # Replace the search backend #WAGTAILSEARCH_BACKENDS = { # 'default': { - # 'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch2', + # 'BACKEND': 'wagtail.search.backends.elasticsearch2', # 'INDEX': 'myapp' # } #} @@ -693,7 +693,7 @@ These two files should reside in your project directory (``myproject/myproject/` from wagtail.core import urls as wagtail_urls from wagtail.admin import urls as wagtailadmin_urls from wagtail.documents import urls as wagtaildocs_urls - from wagtail.wagtailsearch import urls as wagtailsearch_urls + from wagtail.search import urls as wagtailsearch_urls urlpatterns = [ diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst index c8c472ff14..852185fcd5 100644 --- a/docs/getting_started/integrating_into_django.rst +++ b/docs/getting_started/integrating_into_django.rst @@ -28,7 +28,7 @@ In your settings file, add the following apps to ``INSTALLED_APPS``: 'wagtail.wagtailsnippets', 'wagtail.documents', 'wagtail.images', - 'wagtail.wagtailsearch', + 'wagtail.search', 'wagtail.admin', 'wagtail.core', diff --git a/docs/getting_started/tutorial.rst b/docs/getting_started/tutorial.rst index 8bb5bf4540..cc4d098e0c 100644 --- a/docs/getting_started/tutorial.rst +++ b/docs/getting_started/tutorial.rst @@ -221,7 +221,7 @@ Now we need a model and template for our blog posts. In ``blog/models.py``: from wagtail.core.models import Page from wagtail.core.fields import RichTextField from wagtail.admin.edit_handlers import FieldPanel - from wagtail.wagtailsearch import index + from wagtail.search import index # Keep the definition of BlogIndexPage, and add: @@ -413,7 +413,7 @@ Add a new ``BlogPageGalleryImage`` model to ``models.py``: from wagtail.core.fields import RichTextField from wagtail.admin.edit_handlers import FieldPanel, InlinePanel from wagtail.images.edit_handlers import ImageChooserPanel - from wagtail.wagtailsearch import index + from wagtail.search import index # ... (Keep the definition of BlogIndexPage, and update BlogPage:) @@ -576,7 +576,7 @@ First, alter ``models.py`` once more: from wagtail.core.fields import RichTextField from wagtail.admin.edit_handlers import FieldPanel, InlinePanel, MultiFieldPanel from wagtail.images.edit_handlers import ImageChooserPanel - from wagtail.wagtailsearch import index + from wagtail.search import index # ... (Keep the definition of BlogIndexPage) diff --git a/docs/reference/contrib/searchpromotions.rst b/docs/reference/contrib/searchpromotions.rst index 621ab9e6e2..090c99ba94 100644 --- a/docs/reference/contrib/searchpromotions.rst +++ b/docs/reference/contrib/searchpromotions.rst @@ -8,7 +8,7 @@ Promoted search results .. versionchanged:: 1.1 - Before Wagtail 1.1, promoted search results were implemented in the :mod:`wagtail.wagtailsearch` core module and called "editors picks". + Before Wagtail 1.1, promoted search results were implemented in the :mod:`wagtail.search` core module and called "editors picks". The ``searchpromotions`` module provides the models and user interface for managing "Promoted search results" and displaying them in a search results page. diff --git a/docs/topics/pages.rst b/docs/topics/pages.rst index e2641b6309..0dbb54f02d 100644 --- a/docs/topics/pages.rst +++ b/docs/topics/pages.rst @@ -30,7 +30,7 @@ This example represents a typical blog post: from wagtail.core.fields import RichTextField from wagtail.admin.edit_handlers import FieldPanel, MultiFieldPanel, InlinePanel from wagtail.images.edit_handlers import ImageChooserPanel - from wagtail.wagtailsearch import index + from wagtail.search import index class BlogPage(Page): diff --git a/docs/topics/search/backends.rst b/docs/topics/search/backends.rst index 525fc2d139..eb65ad55ad 100644 --- a/docs/topics/search/backends.rst +++ b/docs/topics/search/backends.rst @@ -13,7 +13,7 @@ You can configure which backend to use with the ``WAGTAILSEARCH_BACKENDS`` setti WAGTAILSEARCH_BACKENDS = { 'default': { - 'BACKEND': 'wagtail.wagtailsearch.backends.db', + 'BACKEND': 'wagtail.search.backends.db', } } @@ -61,7 +61,7 @@ Here's a list of backends that Wagtail supports out of the box. Database Backend (default) -------------------------- -``wagtail.wagtailsearch.backends.db`` +``wagtail.search.backends.db`` The database backend is very basic and is intended only to be used in development and on small sites. It cannot order results by relevance, severely hampering its usefulness when searching a large collection of pages. @@ -99,9 +99,9 @@ Elasticsearch Backend Elasticsearch versions 2 and 5 are supported. Use the appropriate backend for your version: -``wagtail.wagtailsearch.backends.elasticsearch2`` (Elasticsearch 2.x) +``wagtail.search.backends.elasticsearch2`` (Elasticsearch 2.x) -``wagtail.wagtailsearch.backends.elasticsearch5`` (Elasticsearch 5.x) +``wagtail.search.backends.elasticsearch5`` (Elasticsearch 5.x) Prerequisites are the `Elasticsearch`_ service itself and, via pip, the `elasticsearch-py`_ package. The major version of the package must match the installed version of Elasticsearch: @@ -121,7 +121,7 @@ The backend is configured in settings: WAGTAILSEARCH_BACKENDS = { 'default': { - 'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch2', + 'BACKEND': 'wagtail.search.backends.elasticsearch2', 'URLS': ['http://localhost:9200'], 'INDEX': 'wagtail', 'TIMEOUT': 5, @@ -177,7 +177,7 @@ The Elasticsearch backend is compatible with `Amazon Elasticsearch Service`_, bu WAGTAILSEARCH_BACKENDS = { 'default': { - 'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch2', + 'BACKEND': 'wagtail.search.backends.elasticsearch2', 'INDEX': 'wagtail', 'TIMEOUT': 5, 'HOSTS': [{ diff --git a/docs/topics/search/indexing.rst b/docs/topics/search/indexing.rst index 60fe1e40b2..dae397c906 100644 --- a/docs/topics/search/indexing.rst +++ b/docs/topics/search/indexing.rst @@ -28,7 +28,7 @@ Signal handlers Signal handlers are now automatically registered -``wagtailsearch`` provides some signal handlers which bind to the save/delete signals of all indexed models. This would automatically add and delete them from all backends you have registered in ``WAGTAILSEARCH_BACKENDS``. These signal handlers are automatically registered when the ``wagtail.wagtailsearch`` app is loaded. +``wagtailsearch`` provides some signal handlers which bind to the save/delete signals of all indexed models. This would automatically add and delete them from all backends you have registered in ``WAGTAILSEARCH_BACKENDS``. These signal handlers are automatically registered when the ``wagtail.search`` app is loaded. The ``update_index`` command @@ -67,7 +67,7 @@ This creates an ``EventPage`` model with two fields: ``description`` and ``date` .. code-block:: python - from wagtail.wagtailsearch import index + from wagtail.search import index from django.utils import timezone class EventPage(Page): @@ -170,7 +170,7 @@ One use for this is indexing the ``get_*_display`` methods Django creates automa .. code-block:: python - from wagtail.wagtailsearch import index + from wagtail.search import index class EventPage(Page): IS_PRIVATE_CHOICES = ( @@ -214,7 +214,7 @@ To do this, inherit from ``index.Indexed`` and add some ``search_fields`` to the .. code-block:: python - from wagtail.wagtailsearch import index + from wagtail.search import index class Book(index.Indexed, models.Model): title = models.CharField(max_length=255) @@ -232,7 +232,7 @@ To do this, inherit from ``index.Indexed`` and add some ``search_fields`` to the ] # As this model doesn't have a search method in its QuerySet, we have to call search directly on the backend - >>> from wagtail.wagtailsearch.backends import get_search_backend + >>> from wagtail.search.backends import get_search_backend >>> s = get_search_backend() # Run a search for a book by Roald Dahl diff --git a/docs/topics/search/searching.rst b/docs/topics/search/searching.rst index 9194ee5dad..3b0a1d4ab7 100644 --- a/docs/topics/search/searching.rst +++ b/docs/topics/search/searching.rst @@ -61,7 +61,7 @@ Wagtail's document and image models provide a ``search`` method on their QuerySe .. code-block:: python >>> from myapp.models import Book - >>> from wagtail.wagtailsearch.backends import get_search_backend + >>> from wagtail.search.backends import get_search_backend # Search books >>> s = get_search_backend() @@ -74,7 +74,7 @@ You can also pass a QuerySet into the ``search`` method which allows you to add .. code-block:: python >>> from myapp.models import Book - >>> from wagtail.wagtailsearch.backends import get_search_backend + >>> from wagtail.search.backends import get_search_backend # Search books >>> s = get_search_backend() @@ -207,7 +207,7 @@ Here's an example Django view that could be used to add a "search" page to your from django.shortcuts import render from wagtail.core.models import Page - from wagtail.wagtailsearch.models import Query + from wagtail.search.models import Query def search(request): diff --git a/docs/topics/snippets.rst b/docs/topics/snippets.rst index a051490cad..18101f8a25 100644 --- a/docs/topics/snippets.rst +++ b/docs/topics/snippets.rst @@ -180,13 +180,13 @@ These child objects are now accessible through the page's ``advert_placements`` Making Snippets Searchable -------------------------- -If a snippet model inherits from ``wagtail.wagtailsearch.index.Indexed``, as described in :ref:`wagtailsearch_indexing_models`, Wagtail will automatically add a search box to the chooser interface for that snippet type. For example, the ``Advert`` snippet could be made searchable as follows: +If a snippet model inherits from ``wagtail.search.index.Indexed``, as described in :ref:`wagtailsearch_indexing_models`, Wagtail will automatically add a search box to the chooser interface for that snippet type. For example, the ``Advert`` snippet could be made searchable as follows: .. code-block:: python ... - from wagtail.wagtailsearch import index + from wagtail.search import index ... diff --git a/tox.ini b/tox.ini index 2332bfac2a..805a2cf8c8 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.images --elasticsearch2 - elasticsearch5: coverage run runtests.py wagtail.wagtailsearch wagtail.documents wagtail.images --elasticsearch5 + elasticsearch2: coverage run runtests.py wagtail.search wagtail.documents wagtail.images --elasticsearch2 + elasticsearch5: coverage run runtests.py wagtail.search wagtail.documents wagtail.images --elasticsearch5 noelasticsearch: coverage run runtests.py basepython = diff --git a/wagtail/admin/tests/test_pages_views.py b/wagtail/admin/tests/test_pages_views.py index bb2cafdd9d..76ccd3904a 100644 --- a/wagtail/admin/tests/test_pages_views.py +++ b/wagtail/admin/tests/test_pages_views.py @@ -30,7 +30,7 @@ from wagtail.admin.views.home import RecentEditsPanel from wagtail.admin.views.pages import PreviewOnEdit from wagtail.core.models import GroupPagePermission, Page, PageRevision, Site from wagtail.core.signals import page_published, page_unpublished -from wagtail.wagtailsearch.index import SearchField +from wagtail.search.index import SearchField from wagtail.wagtailusers.models import UserProfile diff --git a/wagtail/admin/views/mixins.py b/wagtail/admin/views/mixins.py index 129b61610f..644a887923 100644 --- a/wagtail/admin/views/mixins.py +++ b/wagtail/admin/views/mixins.py @@ -3,8 +3,8 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext as _ from wagtail.admin.forms import SearchForm -from wagtail.wagtailsearch.backends import get_search_backend -from wagtail.wagtailsearch.index import class_is_indexed +from wagtail.search.backends import get_search_backend +from wagtail.search.index import class_is_indexed class SearchableListMixin(object): diff --git a/wagtail/api/v2/filters.py b/wagtail/api/v2/filters.py index 72d28c5f02..54b838e39d 100644 --- a/wagtail/api/v2/filters.py +++ b/wagtail/api/v2/filters.py @@ -7,7 +7,7 @@ from taggit.managers import TaggableManager from wagtail.core import hooks from wagtail.core.models import Page -from wagtail.wagtailsearch.backends import get_search_backend +from wagtail.search.backends import get_search_backend from .utils import BadRequestError, pages_for_site, parse_boolean diff --git a/wagtail/contrib/postgres_search/backend.py b/wagtail/contrib/postgres_search/backend.py index 7288ea139b..86f55248e0 100644 --- a/wagtail/contrib/postgres_search/backend.py +++ b/wagtail/contrib/postgres_search/backend.py @@ -9,9 +9,9 @@ from django.db.models.constants import LOOKUP_SEP from django.db.models.functions import Cast from django.utils.encoding import force_text -from wagtail.wagtailsearch.backends.base import ( +from wagtail.search.backends.base import ( BaseSearchBackend, BaseSearchQuery, BaseSearchResults) -from wagtail.wagtailsearch.index import RelatedFields, SearchField +from wagtail.search.index import RelatedFields, SearchField from .models import IndexEntry from .utils import ( diff --git a/wagtail/contrib/postgres_search/tests/test_backend.py b/wagtail/contrib/postgres_search/tests/test_backend.py index f9322ef9fb..bb6e9c9428 100644 --- a/wagtail/contrib/postgres_search/tests/test_backend.py +++ b/wagtail/contrib/postgres_search/tests/test_backend.py @@ -5,7 +5,7 @@ import unittest from django.test import TestCase -from wagtail.wagtailsearch.tests.test_backends import BackendTests +from wagtail.search.tests.test_backends import BackendTests from ..utils import BOOSTS_WEIGHTS, WEIGHTS_VALUES, determine_boosts_weights, get_weight diff --git a/wagtail/contrib/postgres_search/utils.py b/wagtail/contrib/postgres_search/utils.py index f3f42f97ac..a900490177 100644 --- a/wagtail/contrib/postgres_search/utils.py +++ b/wagtail/contrib/postgres_search/utils.py @@ -8,7 +8,7 @@ from itertools import zip_longest from django.apps import apps from django.db import connections -from wagtail.wagtailsearch.index import Indexed, RelatedFields, SearchField +from wagtail.search.index import Indexed, RelatedFields, SearchField try: # Only use the GPLv2 licensed unidecode if it's installed. diff --git a/wagtail/contrib/wagtailsearchpromotions/forms.py b/wagtail/contrib/wagtailsearchpromotions/forms.py index b95870016e..ec1caf7285 100644 --- a/wagtail/contrib/wagtailsearchpromotions/forms.py +++ b/wagtail/contrib/wagtailsearchpromotions/forms.py @@ -6,7 +6,7 @@ from django.utils.translation import ugettext_lazy as _ from wagtail.contrib.wagtailsearchpromotions.models import SearchPromotion from wagtail.admin.widgets import AdminPageChooser -from wagtail.wagtailsearch.models import Query +from wagtail.search.models import Query class SearchPromotionForm(forms.ModelForm): diff --git a/wagtail/contrib/wagtailsearchpromotions/models.py b/wagtail/contrib/wagtailsearchpromotions/models.py index 4e2f17ebc2..4de3f24edf 100644 --- a/wagtail/contrib/wagtailsearchpromotions/models.py +++ b/wagtail/contrib/wagtailsearchpromotions/models.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.db import models from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailsearch.models import Query +from wagtail.search.models import Query class SearchPromotion(models.Model): diff --git a/wagtail/contrib/wagtailsearchpromotions/templatetags/wagtailsearchpromotions_tags.py b/wagtail/contrib/wagtailsearchpromotions/templatetags/wagtailsearchpromotions_tags.py index 60b4601a01..385c9569d7 100644 --- a/wagtail/contrib/wagtailsearchpromotions/templatetags/wagtailsearchpromotions_tags.py +++ b/wagtail/contrib/wagtailsearchpromotions/templatetags/wagtailsearchpromotions_tags.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django import template from wagtail.contrib.wagtailsearchpromotions.models import SearchPromotion -from wagtail.wagtailsearch.models import Query +from wagtail.search.models import Query register = template.Library() diff --git a/wagtail/contrib/wagtailsearchpromotions/tests.py b/wagtail/contrib/wagtailsearchpromotions/tests.py index ca8ef8c768..4a0710cdf5 100644 --- a/wagtail/contrib/wagtailsearchpromotions/tests.py +++ b/wagtail/contrib/wagtailsearchpromotions/tests.py @@ -7,7 +7,7 @@ from wagtail.contrib.wagtailsearchpromotions.models import SearchPromotion from wagtail.contrib.wagtailsearchpromotions.templatetags.wagtailsearchpromotions_tags import \ get_search_promotions from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailsearch.models import Query +from wagtail.search.models import Query class TestSearchPromotions(TestCase): diff --git a/wagtail/contrib/wagtailsearchpromotions/views.py b/wagtail/contrib/wagtailsearchpromotions/views.py index 801e7e31ac..b2fde9e166 100644 --- a/wagtail/contrib/wagtailsearchpromotions/views.py +++ b/wagtail/contrib/wagtailsearchpromotions/views.py @@ -10,8 +10,8 @@ from wagtail.utils.pagination import paginate from wagtail.admin import messages from wagtail.admin.forms import SearchForm from wagtail.admin.utils import any_permission_required, permission_required -from wagtail.wagtailsearch import forms as search_forms -from wagtail.wagtailsearch.models import Query +from wagtail.search import forms as search_forms +from wagtail.search.models import Query @any_permission_required( diff --git a/wagtail/core/migrations/0001_initial.py b/wagtail/core/migrations/0001_initial.py index 224c380f29..bc7a48f604 100644 --- a/wagtail/core/migrations/0001_initial.py +++ b/wagtail/core/migrations/0001_initial.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from django.conf import settings from django.db import migrations, models -import wagtail.wagtailsearch.index +import wagtail.search.index def set_page_path_collation(apps, schema_editor): @@ -96,7 +96,7 @@ class Migration(migrations.Migration): options={ 'abstract': False, }, - bases=(wagtail.wagtailsearch.index.Indexed, models.Model), + bases=(wagtail.search.index.Indexed, models.Model), ), migrations.RunPython( set_page_path_collation, migrations.RunPython.noop diff --git a/wagtail/core/migrations/0001_squashed_0016_change_page_url_path_to_text_field.py b/wagtail/core/migrations/0001_squashed_0016_change_page_url_path_to_text_field.py index 03c8a3ce14..9d40a455ed 100644 --- a/wagtail/core/migrations/0001_squashed_0016_change_page_url_path_to_text_field.py +++ b/wagtail/core/migrations/0001_squashed_0016_change_page_url_path_to_text_field.py @@ -5,7 +5,7 @@ import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import wagtail.wagtailsearch.index +import wagtail.search.index def initial_data(apps, schema_editor): @@ -238,7 +238,7 @@ class Migration(migrations.Migration): options={ 'abstract': False, }, - bases=(wagtail.wagtailsearch.index.Indexed, models.Model), + bases=(wagtail.search.index.Indexed, models.Model), ), migrations.RunPython( set_page_path_collation, migrations.RunPython.noop diff --git a/wagtail/core/models.py b/wagtail/core/models.py index 6068f23045..192e1b2555 100644 --- a/wagtail/core/models.py +++ b/wagtail/core/models.py @@ -34,7 +34,7 @@ from wagtail.core.sites import get_site_for_hostname from wagtail.core.url_routing import RouteResult from wagtail.core.utils import ( WAGTAIL_APPEND_SLASH, camelcase_to_underscore, resolve_model_string) -from wagtail.wagtailsearch import index +from wagtail.search import index logger = logging.getLogger('wagtail.core') diff --git a/wagtail/core/query.py b/wagtail/core/query.py index 4431dba934..93e51501e2 100644 --- a/wagtail/core/query.py +++ b/wagtail/core/query.py @@ -10,7 +10,7 @@ from django.db.models.functions import Length, Substr from django.db.models.query import BaseIterable from treebeard.mp_tree import MP_NodeQuerySet -from wagtail.wagtailsearch.queryset import SearchableQuerySetMixin +from wagtail.search.queryset import SearchableQuerySetMixin class TreeQuerySet(MP_NodeQuerySet): diff --git a/wagtail/core/tests/test_page_queryset.py b/wagtail/core/tests/test_page_queryset.py index 002a468983..48ef491507 100644 --- a/wagtail/core/tests/test_page_queryset.py +++ b/wagtail/core/tests/test_page_queryset.py @@ -593,7 +593,7 @@ class TestSpecificQuery(TestCase): # 1276 - The database search backend didn't return results with the # specific type when searching a specific queryset. - pages = list(Page.objects.specific().live().in_menu().search(None, backend='wagtail.wagtailsearch.backends.db')) + pages = list(Page.objects.specific().live().in_menu().search(None, backend='wagtail.search.backends.db')) # Check that each page is in the queryset with the correct type. # We don't care about order here diff --git a/wagtail/documents/migrations/0001_initial.py b/wagtail/documents/migrations/0001_initial.py index f0d6c5c749..09e702e587 100644 --- a/wagtail/documents/migrations/0001_initial.py +++ b/wagtail/documents/migrations/0001_initial.py @@ -5,7 +5,7 @@ import taggit.managers from django.conf import settings from django.db import migrations, models -import wagtail.wagtailsearch.index +import wagtail.search.index class Migration(migrations.Migration): @@ -46,6 +46,6 @@ class Migration(migrations.Migration): ], options={ }, - bases=(models.Model, wagtail.wagtailsearch.index.Indexed), + bases=(models.Model, wagtail.search.index.Indexed), ), ] diff --git a/wagtail/documents/models.py b/wagtail/documents/models.py index 4140ba4fe3..f66fc570ed 100644 --- a/wagtail/documents/models.py +++ b/wagtail/documents/models.py @@ -12,8 +12,8 @@ from taggit.managers import TaggableManager from wagtail.admin.utils import get_object_usage from wagtail.core.models import CollectionMember -from wagtail.wagtailsearch import index -from wagtail.wagtailsearch.queryset import SearchableQuerySetMixin +from wagtail.search import index +from wagtail.search.queryset import SearchableQuerySetMixin class DocumentQuerySet(SearchableQuerySetMixin, models.QuerySet): diff --git a/wagtail/documents/tests/test_search.py b/wagtail/documents/tests/test_search.py index d440aaeb6b..43c32e8b16 100644 --- a/wagtail/documents/tests/test_search.py +++ b/wagtail/documents/tests/test_search.py @@ -16,9 +16,9 @@ from wagtail.documents import models class TestIssue613(TestCase, WagtailTestUtils): def get_elasticsearch_backend(self): from django.conf import settings - from wagtail.wagtailsearch.backends import get_search_backend + from wagtail.search.backends import get_search_backend - backend_path = 'wagtail.wagtailsearch.backends.elasticsearch' + backend_path = 'wagtail.search.backends.elasticsearch' # Search WAGTAILSEARCH_BACKENDS for an entry that uses the given backend path for backend_name, backend_conf in settings.WAGTAILSEARCH_BACKENDS.items(): diff --git a/wagtail/documents/views/chooser.py b/wagtail/documents/views/chooser.py index 4802208743..bfd9202fcc 100644 --- a/wagtail/documents/views/chooser.py +++ b/wagtail/documents/views/chooser.py @@ -14,7 +14,7 @@ from wagtail.core.models import Collection from wagtail.documents.forms import get_document_form from wagtail.documents.models import get_document_model from wagtail.documents.permissions import permission_policy -from wagtail.wagtailsearch import index as search_index +from wagtail.search import index as search_index permission_checker = PermissionPolicyChecker(permission_policy) diff --git a/wagtail/documents/views/documents.py b/wagtail/documents/views/documents.py index 1df24eff50..85e71b5edd 100644 --- a/wagtail/documents/views/documents.py +++ b/wagtail/documents/views/documents.py @@ -14,7 +14,7 @@ from wagtail.core.models import Collection from wagtail.documents.forms import get_document_form from wagtail.documents.models import get_document_model from wagtail.documents.permissions import permission_policy -from wagtail.wagtailsearch import index as search_index +from wagtail.search import index as search_index permission_checker = PermissionPolicyChecker(permission_policy) diff --git a/wagtail/documents/views/multiple.py b/wagtail/documents/views/multiple.py index c135e9d51c..0eab55ae31 100644 --- a/wagtail/documents/views/multiple.py +++ b/wagtail/documents/views/multiple.py @@ -9,7 +9,7 @@ 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.wagtailsearch.backends import get_search_backends +from wagtail.search.backends import get_search_backends from ..forms import get_document_form, get_document_multi_form from ..models import get_document_model diff --git a/wagtail/images/migrations/0001_initial.py b/wagtail/images/migrations/0001_initial.py index acabc4fa0f..74eeb4dc03 100644 --- a/wagtail/images/migrations/0001_initial.py +++ b/wagtail/images/migrations/0001_initial.py @@ -6,7 +6,7 @@ from django.conf import settings from django.db import migrations, models import wagtail.images.models -import wagtail.wagtailsearch.index +import wagtail.search.index class Migration(migrations.Migration): @@ -54,7 +54,7 @@ class Migration(migrations.Migration): options={ 'abstract': False, }, - bases=(models.Model, wagtail.wagtailsearch.index.Indexed), + bases=(models.Model, wagtail.search.index.Indexed), ), migrations.CreateModel( name='Rendition', diff --git a/wagtail/images/models.py b/wagtail/images/models.py index 5a2a48f726..1e37a0fc16 100644 --- a/wagtail/images/models.py +++ b/wagtail/images/models.py @@ -25,8 +25,8 @@ from wagtail.core import hooks from wagtail.core.models import CollectionMember from wagtail.images.exceptions import InvalidFilterSpecError from wagtail.images.rect import Rect -from wagtail.wagtailsearch import index -from wagtail.wagtailsearch.queryset import SearchableQuerySetMixin +from wagtail.search import index +from wagtail.search.queryset import SearchableQuerySetMixin class SourceImageIOError(IOError): diff --git a/wagtail/images/tests/test_models.py b/wagtail/images/tests/test_models.py index 614718261b..9897d4dc22 100644 --- a/wagtail/images/tests/test_models.py +++ b/wagtail/images/tests/test_models.py @@ -374,9 +374,9 @@ class TestIssue573(TestCase): class TestIssue613(TestCase, WagtailTestUtils): def get_elasticsearch_backend(self): from django.conf import settings - from wagtail.wagtailsearch.backends import get_search_backend + from wagtail.search.backends import get_search_backend - backend_path = 'wagtail.wagtailsearch.backends.elasticsearch' + backend_path = 'wagtail.search.backends.elasticsearch' # Search WAGTAILSEARCH_BACKENDS for an entry that uses the given backend path for backend_name, backend_conf in settings.WAGTAILSEARCH_BACKENDS.items(): diff --git a/wagtail/images/views/chooser.py b/wagtail/images/views/chooser.py index d173f5e477..ad6286b745 100644 --- a/wagtail/images/views/chooser.py +++ b/wagtail/images/views/chooser.py @@ -15,7 +15,7 @@ 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 +from wagtail.search import index as search_index permission_checker = PermissionPolicyChecker(permission_policy) diff --git a/wagtail/images/views/images.py b/wagtail/images/views/images.py index 4d8a87c11f..5c5d381de9 100644 --- a/wagtail/images/views/images.py +++ b/wagtail/images/views/images.py @@ -21,7 +21,7 @@ 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 +from wagtail.search import index as search_index permission_checker = PermissionPolicyChecker(permission_policy) diff --git a/wagtail/images/views/multiple.py b/wagtail/images/views/multiple.py index b253cd4d33..b54201de13 100644 --- a/wagtail/images/views/multiple.py +++ b/wagtail/images/views/multiple.py @@ -13,7 +13,7 @@ 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 +from wagtail.search.backends import get_search_backends permission_checker = PermissionPolicyChecker(permission_policy) diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py index 45fe7315b5..b235837a38 100644 --- a/wagtail/project_template/project_name/settings/base.py +++ b/wagtail/project_template/project_name/settings/base.py @@ -37,7 +37,7 @@ INSTALLED_APPS = [ 'wagtail.wagtailsnippets', 'wagtail.documents', 'wagtail.images', - 'wagtail.wagtailsearch', + 'wagtail.search', 'wagtail.admin', 'wagtail.core', diff --git a/wagtail/project_template/search/views.py b/wagtail/project_template/search/views.py index 9313b35c54..78b1631033 100644 --- a/wagtail/project_template/search/views.py +++ b/wagtail/project_template/search/views.py @@ -4,7 +4,7 @@ from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator from django.shortcuts import render from wagtail.core.models import Page -from wagtail.wagtailsearch.models import Query +from wagtail.search.models import Query def search(request): diff --git a/wagtail/search/__init__.py b/wagtail/search/__init__.py new file mode 100644 index 0000000000..ec89cb70ea --- /dev/null +++ b/wagtail/search/__init__.py @@ -0,0 +1 @@ +default_app_config = 'wagtail.search.apps.WagtailSearchAppConfig' diff --git a/wagtail/wagtailsearch/apps.py b/wagtail/search/apps.py similarity index 70% rename from wagtail/wagtailsearch/apps.py rename to wagtail/search/apps.py index 49b1f149d6..96260af5de 100644 --- a/wagtail/wagtailsearch/apps.py +++ b/wagtail/search/apps.py @@ -2,11 +2,11 @@ from __future__ import absolute_import, unicode_literals from django.apps import AppConfig -from wagtail.wagtailsearch.signal_handlers import register_signal_handlers +from wagtail.search.signal_handlers import register_signal_handlers class WagtailSearchAppConfig(AppConfig): - name = 'wagtail.wagtailsearch' + name = 'wagtail.search' label = 'wagtailsearch' verbose_name = "Wagtail search" diff --git a/wagtail/wagtailsearch/backends/__init__.py b/wagtail/search/backends/__init__.py similarity index 94% rename from wagtail/wagtailsearch/backends/__init__.py rename to wagtail/search/backends/__init__.py index 6bb213a54d..9258c7793f 100644 --- a/wagtail/wagtailsearch/backends/__init__.py +++ b/wagtail/search/backends/__init__.py @@ -20,7 +20,7 @@ def get_search_backend_config(): # Make sure the default backend is always defined search_backends.setdefault('default', { - 'BACKEND': 'wagtail.wagtailsearch.backends.db', + 'BACKEND': 'wagtail.search.backends.db', }) return search_backends @@ -31,8 +31,8 @@ def import_backend(dotted_path): Theres two formats for the dotted_path. One with the backend class (old) and one without (new) eg: - old: wagtail.wagtailsearch.backends.elasticsearch.ElasticsearchSearchBackend - new: wagtail.wagtailsearch.backends.elasticsearch + old: wagtail.search.backends.elasticsearch.ElasticsearchSearchBackend + new: wagtail.search.backends.elasticsearch If a new style dotted path was specified, this function would look for a backend class from the "SearchBackend" attribute. diff --git a/wagtail/wagtailsearch/backends/base.py b/wagtail/search/backends/base.py similarity index 99% rename from wagtail/wagtailsearch/backends/base.py rename to wagtail/search/backends/base.py index c0fc4cc8ab..db385e3194 100644 --- a/wagtail/wagtailsearch/backends/base.py +++ b/wagtail/search/backends/base.py @@ -5,7 +5,7 @@ from django.db.models.lookups import Lookup from django.db.models.query import QuerySet from django.db.models.sql.where import SubqueryConstraint, WhereNode -from wagtail.wagtailsearch.index import class_is_indexed +from wagtail.search.index import class_is_indexed class FilterError(Exception): diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/search/backends/db.py similarity index 98% rename from wagtail/wagtailsearch/backends/db.py rename to wagtail/search/backends/db.py index 90539fad05..1145d7cebe 100644 --- a/wagtail/wagtailsearch/backends/db.py +++ b/wagtail/search/backends/db.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.db import models from django.db.models.expressions import Value -from wagtail.wagtailsearch.backends.base import ( +from wagtail.search.backends.base import ( BaseSearchBackend, BaseSearchQuery, BaseSearchResults) diff --git a/wagtail/wagtailsearch/backends/elasticsearch2.py b/wagtail/search/backends/elasticsearch2.py similarity index 99% rename from wagtail/wagtailsearch/backends/elasticsearch2.py rename to wagtail/search/backends/elasticsearch2.py index 207d8155ec..da8c12bde6 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch2.py +++ b/wagtail/search/backends/elasticsearch2.py @@ -12,9 +12,9 @@ from elasticsearch import Elasticsearch, NotFoundError from elasticsearch.helpers import bulk from wagtail.utils.utils import deep_update -from wagtail.wagtailsearch.backends.base import ( +from wagtail.search.backends.base import ( BaseSearchBackend, BaseSearchQuery, BaseSearchResults) -from wagtail.wagtailsearch.index import ( +from wagtail.search.index import ( FilterField, Indexed, RelatedFields, SearchField, class_is_indexed) diff --git a/wagtail/wagtailsearch/backends/elasticsearch5.py b/wagtail/search/backends/elasticsearch5.py similarity index 100% rename from wagtail/wagtailsearch/backends/elasticsearch5.py rename to wagtail/search/backends/elasticsearch5.py diff --git a/wagtail/wagtailsearch/forms.py b/wagtail/search/forms.py similarity index 100% rename from wagtail/wagtailsearch/forms.py rename to wagtail/search/forms.py diff --git a/wagtail/wagtailsearch/index.py b/wagtail/search/index.py similarity index 99% rename from wagtail/wagtailsearch/index.py rename to wagtail/search/index.py index e69bda24ff..a0dc9631c5 100644 --- a/wagtail/wagtailsearch/index.py +++ b/wagtail/search/index.py @@ -9,7 +9,7 @@ from django.db import models from django.db.models.fields import FieldDoesNotExist from django.db.models.fields.related import ForeignObjectRel, OneToOneRel, RelatedField -from wagtail.wagtailsearch.backends import get_search_backends_with_name +from wagtail.search.backends import get_search_backends_with_name logger = logging.getLogger('wagtail.search.index') diff --git a/wagtail/wagtailsearch/locale/ar/LC_MESSAGES/django.mo b/wagtail/search/locale/ar/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/ar/LC_MESSAGES/django.mo rename to wagtail/search/locale/ar/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/ar/LC_MESSAGES/django.po b/wagtail/search/locale/ar/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/ar/LC_MESSAGES/django.po rename to wagtail/search/locale/ar/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/bg/LC_MESSAGES/django.mo b/wagtail/search/locale/bg/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/bg/LC_MESSAGES/django.mo rename to wagtail/search/locale/bg/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/bg/LC_MESSAGES/django.po b/wagtail/search/locale/bg/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/bg/LC_MESSAGES/django.po rename to wagtail/search/locale/bg/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/ca/LC_MESSAGES/django.mo b/wagtail/search/locale/ca/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/ca/LC_MESSAGES/django.mo rename to wagtail/search/locale/ca/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/ca/LC_MESSAGES/django.po b/wagtail/search/locale/ca/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/ca/LC_MESSAGES/django.po rename to wagtail/search/locale/ca/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/cs/LC_MESSAGES/django.mo b/wagtail/search/locale/cs/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/cs/LC_MESSAGES/django.mo rename to wagtail/search/locale/cs/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/cs/LC_MESSAGES/django.po b/wagtail/search/locale/cs/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/cs/LC_MESSAGES/django.po rename to wagtail/search/locale/cs/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/cy/LC_MESSAGES/django.mo b/wagtail/search/locale/cy/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/cy/LC_MESSAGES/django.mo rename to wagtail/search/locale/cy/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/cy/LC_MESSAGES/django.po b/wagtail/search/locale/cy/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/cy/LC_MESSAGES/django.po rename to wagtail/search/locale/cy/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/de/LC_MESSAGES/django.mo b/wagtail/search/locale/de/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/de/LC_MESSAGES/django.mo rename to wagtail/search/locale/de/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/de/LC_MESSAGES/django.po b/wagtail/search/locale/de/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/de/LC_MESSAGES/django.po rename to wagtail/search/locale/de/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/el/LC_MESSAGES/django.mo b/wagtail/search/locale/el/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/el/LC_MESSAGES/django.mo rename to wagtail/search/locale/el/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/el/LC_MESSAGES/django.po b/wagtail/search/locale/el/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/el/LC_MESSAGES/django.po rename to wagtail/search/locale/el/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.mo b/wagtail/search/locale/en/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.mo rename to wagtail/search/locale/en/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.po b/wagtail/search/locale/en/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/en/LC_MESSAGES/django.po rename to wagtail/search/locale/en/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/es/LC_MESSAGES/django.mo b/wagtail/search/locale/es/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/es/LC_MESSAGES/django.mo rename to wagtail/search/locale/es/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/es/LC_MESSAGES/django.po b/wagtail/search/locale/es/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/es/LC_MESSAGES/django.po rename to wagtail/search/locale/es/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/fa/LC_MESSAGES/django.mo b/wagtail/search/locale/fa/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/fa/LC_MESSAGES/django.mo rename to wagtail/search/locale/fa/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/fa/LC_MESSAGES/django.po b/wagtail/search/locale/fa/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/fa/LC_MESSAGES/django.po rename to wagtail/search/locale/fa/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/fi/LC_MESSAGES/django.mo b/wagtail/search/locale/fi/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/fi/LC_MESSAGES/django.mo rename to wagtail/search/locale/fi/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/fi/LC_MESSAGES/django.po b/wagtail/search/locale/fi/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/fi/LC_MESSAGES/django.po rename to wagtail/search/locale/fi/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/fr/LC_MESSAGES/django.mo b/wagtail/search/locale/fr/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/fr/LC_MESSAGES/django.mo rename to wagtail/search/locale/fr/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/fr/LC_MESSAGES/django.po b/wagtail/search/locale/fr/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/fr/LC_MESSAGES/django.po rename to wagtail/search/locale/fr/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/gl/LC_MESSAGES/django.mo b/wagtail/search/locale/gl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/gl/LC_MESSAGES/django.mo rename to wagtail/search/locale/gl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/gl/LC_MESSAGES/django.po b/wagtail/search/locale/gl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/gl/LC_MESSAGES/django.po rename to wagtail/search/locale/gl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/he_IL/LC_MESSAGES/django.mo b/wagtail/search/locale/he_IL/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/he_IL/LC_MESSAGES/django.mo rename to wagtail/search/locale/he_IL/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/he_IL/LC_MESSAGES/django.po b/wagtail/search/locale/he_IL/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/he_IL/LC_MESSAGES/django.po rename to wagtail/search/locale/he_IL/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/hu/LC_MESSAGES/django.mo b/wagtail/search/locale/hu/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/hu/LC_MESSAGES/django.mo rename to wagtail/search/locale/hu/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/hu/LC_MESSAGES/django.po b/wagtail/search/locale/hu/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/hu/LC_MESSAGES/django.po rename to wagtail/search/locale/hu/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/id_ID/LC_MESSAGES/django.mo b/wagtail/search/locale/id_ID/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/id_ID/LC_MESSAGES/django.mo rename to wagtail/search/locale/id_ID/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/id_ID/LC_MESSAGES/django.po b/wagtail/search/locale/id_ID/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/id_ID/LC_MESSAGES/django.po rename to wagtail/search/locale/id_ID/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/is_IS/LC_MESSAGES/django.mo b/wagtail/search/locale/is_IS/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/is_IS/LC_MESSAGES/django.mo rename to wagtail/search/locale/is_IS/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/is_IS/LC_MESSAGES/django.po b/wagtail/search/locale/is_IS/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/is_IS/LC_MESSAGES/django.po rename to wagtail/search/locale/is_IS/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/it/LC_MESSAGES/django.mo b/wagtail/search/locale/it/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/it/LC_MESSAGES/django.mo rename to wagtail/search/locale/it/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/it/LC_MESSAGES/django.po b/wagtail/search/locale/it/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/it/LC_MESSAGES/django.po rename to wagtail/search/locale/it/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/ja/LC_MESSAGES/django.mo b/wagtail/search/locale/ja/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/ja/LC_MESSAGES/django.mo rename to wagtail/search/locale/ja/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/ja/LC_MESSAGES/django.po b/wagtail/search/locale/ja/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/ja/LC_MESSAGES/django.po rename to wagtail/search/locale/ja/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/ka/LC_MESSAGES/django.mo b/wagtail/search/locale/ka/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/ka/LC_MESSAGES/django.mo rename to wagtail/search/locale/ka/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/ka/LC_MESSAGES/django.po b/wagtail/search/locale/ka/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/ka/LC_MESSAGES/django.po rename to wagtail/search/locale/ka/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/ko/LC_MESSAGES/django.mo b/wagtail/search/locale/ko/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/ko/LC_MESSAGES/django.mo rename to wagtail/search/locale/ko/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/ko/LC_MESSAGES/django.po b/wagtail/search/locale/ko/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/ko/LC_MESSAGES/django.po rename to wagtail/search/locale/ko/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/lt/LC_MESSAGES/django.mo b/wagtail/search/locale/lt/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/lt/LC_MESSAGES/django.mo rename to wagtail/search/locale/lt/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/lt/LC_MESSAGES/django.po b/wagtail/search/locale/lt/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/lt/LC_MESSAGES/django.po rename to wagtail/search/locale/lt/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/lv/LC_MESSAGES/django.mo b/wagtail/search/locale/lv/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/lv/LC_MESSAGES/django.mo rename to wagtail/search/locale/lv/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/lv/LC_MESSAGES/django.po b/wagtail/search/locale/lv/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/lv/LC_MESSAGES/django.po rename to wagtail/search/locale/lv/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/mn/LC_MESSAGES/django.mo b/wagtail/search/locale/mn/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/mn/LC_MESSAGES/django.mo rename to wagtail/search/locale/mn/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/mn/LC_MESSAGES/django.po b/wagtail/search/locale/mn/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/mn/LC_MESSAGES/django.po rename to wagtail/search/locale/mn/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/nb/LC_MESSAGES/django.mo b/wagtail/search/locale/nb/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/nb/LC_MESSAGES/django.mo rename to wagtail/search/locale/nb/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/nb/LC_MESSAGES/django.po b/wagtail/search/locale/nb/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/nb/LC_MESSAGES/django.po rename to wagtail/search/locale/nb/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/nl/LC_MESSAGES/django.mo b/wagtail/search/locale/nl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/nl/LC_MESSAGES/django.mo rename to wagtail/search/locale/nl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/nl/LC_MESSAGES/django.po b/wagtail/search/locale/nl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/nl/LC_MESSAGES/django.po rename to wagtail/search/locale/nl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/nl_NL/LC_MESSAGES/django.mo b/wagtail/search/locale/nl_NL/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/nl_NL/LC_MESSAGES/django.mo rename to wagtail/search/locale/nl_NL/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/nl_NL/LC_MESSAGES/django.po b/wagtail/search/locale/nl_NL/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/nl_NL/LC_MESSAGES/django.po rename to wagtail/search/locale/nl_NL/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/pl/LC_MESSAGES/django.mo b/wagtail/search/locale/pl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/pl/LC_MESSAGES/django.mo rename to wagtail/search/locale/pl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/pl/LC_MESSAGES/django.po b/wagtail/search/locale/pl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/pl/LC_MESSAGES/django.po rename to wagtail/search/locale/pl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/pt_BR/LC_MESSAGES/django.mo b/wagtail/search/locale/pt_BR/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/pt_BR/LC_MESSAGES/django.mo rename to wagtail/search/locale/pt_BR/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/pt_BR/LC_MESSAGES/django.po b/wagtail/search/locale/pt_BR/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/pt_BR/LC_MESSAGES/django.po rename to wagtail/search/locale/pt_BR/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/pt_PT/LC_MESSAGES/django.mo b/wagtail/search/locale/pt_PT/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/pt_PT/LC_MESSAGES/django.mo rename to wagtail/search/locale/pt_PT/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/pt_PT/LC_MESSAGES/django.po b/wagtail/search/locale/pt_PT/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/pt_PT/LC_MESSAGES/django.po rename to wagtail/search/locale/pt_PT/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/ro/LC_MESSAGES/django.mo b/wagtail/search/locale/ro/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/ro/LC_MESSAGES/django.mo rename to wagtail/search/locale/ro/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/ro/LC_MESSAGES/django.po b/wagtail/search/locale/ro/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/ro/LC_MESSAGES/django.po rename to wagtail/search/locale/ro/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/ru/LC_MESSAGES/django.mo b/wagtail/search/locale/ru/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/ru/LC_MESSAGES/django.mo rename to wagtail/search/locale/ru/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/ru/LC_MESSAGES/django.po b/wagtail/search/locale/ru/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/ru/LC_MESSAGES/django.po rename to wagtail/search/locale/ru/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/sk_SK/LC_MESSAGES/django.mo b/wagtail/search/locale/sk_SK/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/sk_SK/LC_MESSAGES/django.mo rename to wagtail/search/locale/sk_SK/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/sk_SK/LC_MESSAGES/django.po b/wagtail/search/locale/sk_SK/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/sk_SK/LC_MESSAGES/django.po rename to wagtail/search/locale/sk_SK/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/sl/LC_MESSAGES/django.mo b/wagtail/search/locale/sl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/sl/LC_MESSAGES/django.mo rename to wagtail/search/locale/sl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/sl/LC_MESSAGES/django.po b/wagtail/search/locale/sl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/sl/LC_MESSAGES/django.po rename to wagtail/search/locale/sl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/sv/LC_MESSAGES/django.mo b/wagtail/search/locale/sv/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/sv/LC_MESSAGES/django.mo rename to wagtail/search/locale/sv/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/sv/LC_MESSAGES/django.po b/wagtail/search/locale/sv/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/sv/LC_MESSAGES/django.po rename to wagtail/search/locale/sv/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/tr/LC_MESSAGES/django.mo b/wagtail/search/locale/tr/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/tr/LC_MESSAGES/django.mo rename to wagtail/search/locale/tr/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/tr/LC_MESSAGES/django.po b/wagtail/search/locale/tr/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/tr/LC_MESSAGES/django.po rename to wagtail/search/locale/tr/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/zh/LC_MESSAGES/django.mo b/wagtail/search/locale/zh/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/zh/LC_MESSAGES/django.mo rename to wagtail/search/locale/zh/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/zh/LC_MESSAGES/django.po b/wagtail/search/locale/zh/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/zh/LC_MESSAGES/django.po rename to wagtail/search/locale/zh/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/locale/zh_CN/LC_MESSAGES/django.mo b/wagtail/search/locale/zh_CN/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailsearch/locale/zh_CN/LC_MESSAGES/django.mo rename to wagtail/search/locale/zh_CN/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailsearch/locale/zh_CN/LC_MESSAGES/django.po b/wagtail/search/locale/zh_CN/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailsearch/locale/zh_CN/LC_MESSAGES/django.po rename to wagtail/search/locale/zh_CN/LC_MESSAGES/django.po diff --git a/wagtail/wagtailsearch/management/__init__.py b/wagtail/search/management/__init__.py similarity index 100% rename from wagtail/wagtailsearch/management/__init__.py rename to wagtail/search/management/__init__.py diff --git a/wagtail/wagtailsearch/management/commands/__init__.py b/wagtail/search/management/commands/__init__.py similarity index 100% rename from wagtail/wagtailsearch/management/commands/__init__.py rename to wagtail/search/management/commands/__init__.py diff --git a/wagtail/wagtailsearch/management/commands/search_garbage_collect.py b/wagtail/search/management/commands/search_garbage_collect.py similarity index 92% rename from wagtail/wagtailsearch/management/commands/search_garbage_collect.py rename to wagtail/search/management/commands/search_garbage_collect.py index 7add5ef735..e9656db3d0 100644 --- a/wagtail/wagtailsearch/management/commands/search_garbage_collect.py +++ b/wagtail/search/management/commands/search_garbage_collect.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.core.management.base import BaseCommand -from wagtail.wagtailsearch import models +from wagtail.search import models class Command(BaseCommand): diff --git a/wagtail/wagtailsearch/management/commands/update_index.py b/wagtail/search/management/commands/update_index.py similarity index 97% rename from wagtail/wagtailsearch/management/commands/update_index.py rename to wagtail/search/management/commands/update_index.py index 75ccc44417..073dfe3a29 100644 --- a/wagtail/wagtailsearch/management/commands/update_index.py +++ b/wagtail/search/management/commands/update_index.py @@ -6,8 +6,8 @@ from django.conf import settings from django.core.management.base import BaseCommand from django.db import transaction -from wagtail.wagtailsearch.backends import get_search_backend -from wagtail.wagtailsearch.index import get_indexed_models +from wagtail.search.backends import get_search_backend +from wagtail.search.index import get_indexed_models def group_models_by_index(backend, models): diff --git a/wagtail/wagtailsearch/migrations/0001_initial.py b/wagtail/search/migrations/0001_initial.py similarity index 100% rename from wagtail/wagtailsearch/migrations/0001_initial.py rename to wagtail/search/migrations/0001_initial.py diff --git a/wagtail/wagtailsearch/migrations/0002_add_verbose_names.py b/wagtail/search/migrations/0002_add_verbose_names.py similarity index 100% rename from wagtail/wagtailsearch/migrations/0002_add_verbose_names.py rename to wagtail/search/migrations/0002_add_verbose_names.py diff --git a/wagtail/wagtailsearch/migrations/0003_remove_editors_pick.py b/wagtail/search/migrations/0003_remove_editors_pick.py similarity index 100% rename from wagtail/wagtailsearch/migrations/0003_remove_editors_pick.py rename to wagtail/search/migrations/0003_remove_editors_pick.py diff --git a/wagtail/wagtailsearch/migrations/__init__.py b/wagtail/search/migrations/__init__.py similarity index 100% rename from wagtail/wagtailsearch/migrations/__init__.py rename to wagtail/search/migrations/__init__.py diff --git a/wagtail/wagtailsearch/models.py b/wagtail/search/models.py similarity index 96% rename from wagtail/wagtailsearch/models.py rename to wagtail/search/models.py index 38146cdc84..c0f32a883b 100644 --- a/wagtail/wagtailsearch/models.py +++ b/wagtail/search/models.py @@ -7,7 +7,7 @@ from django.db import models from django.utils import timezone from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailsearch.utils import MAX_QUERY_STRING_LENGTH, normalise_query_string +from wagtail.search.utils import MAX_QUERY_STRING_LENGTH, normalise_query_string class Query(models.Model): diff --git a/wagtail/wagtailsearch/queryset.py b/wagtail/search/queryset.py similarity index 89% rename from wagtail/wagtailsearch/queryset.py rename to wagtail/search/queryset.py index 3471a48691..d5324623c6 100644 --- a/wagtail/wagtailsearch/queryset.py +++ b/wagtail/search/queryset.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from wagtail.wagtailsearch.backends import get_search_backend +from wagtail.search.backends import get_search_backend class SearchableQuerySetMixin(object): diff --git a/wagtail/wagtailsearch/signal_handlers.py b/wagtail/search/signal_handlers.py similarity index 95% rename from wagtail/wagtailsearch/signal_handlers.py rename to wagtail/search/signal_handlers.py index 559ef9262f..6f5799c3c2 100644 --- a/wagtail/wagtailsearch/signal_handlers.py +++ b/wagtail/search/signal_handlers.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.db.models.signals import post_delete, post_save -from wagtail.wagtailsearch import index +from wagtail.search import index def post_save_signal_handler(instance, update_fields=None, **kwargs): diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html b/wagtail/search/templates/wagtailsearch/queries/chooser/chooser.html similarity index 100% rename from wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html rename to wagtail/search/templates/wagtailsearch/queries/chooser/chooser.html diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.js b/wagtail/search/templates/wagtailsearch/queries/chooser/chooser.js similarity index 100% rename from wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.js rename to wagtail/search/templates/wagtailsearch/queries/chooser/chooser.js diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/results.html b/wagtail/search/templates/wagtailsearch/queries/chooser/results.html similarity index 100% rename from wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/results.html rename to wagtail/search/templates/wagtailsearch/queries/chooser/results.html diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.html b/wagtail/search/templates/wagtailsearch/queries/chooser_field.html similarity index 100% rename from wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.html rename to wagtail/search/templates/wagtailsearch/queries/chooser_field.html diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.js b/wagtail/search/templates/wagtailsearch/queries/chooser_field.js similarity index 100% rename from wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.js rename to wagtail/search/templates/wagtailsearch/queries/chooser_field.js diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/search_results.html b/wagtail/search/templates/wagtailsearch/search_results.html similarity index 100% rename from wagtail/wagtailsearch/templates/wagtailsearch/search_results.html rename to wagtail/search/templates/wagtailsearch/search_results.html diff --git a/wagtail/wagtailsearch/tests/__init__.py b/wagtail/search/tests/__init__.py similarity index 100% rename from wagtail/wagtailsearch/tests/__init__.py rename to wagtail/search/tests/__init__.py diff --git a/wagtail/wagtailsearch/tests/elasticsearch_common_tests.py b/wagtail/search/tests/elasticsearch_common_tests.py similarity index 98% rename from wagtail/wagtailsearch/tests/elasticsearch_common_tests.py rename to wagtail/search/tests/elasticsearch_common_tests.py index bb0c1a2084..b4e63f7b73 100644 --- a/wagtail/wagtailsearch/tests/elasticsearch_common_tests.py +++ b/wagtail/search/tests/elasticsearch_common_tests.py @@ -22,7 +22,7 @@ class ElasticsearchCommonSearchBackendTests(object): """ Not all lookup types are supported by the Elasticsearch backends """ - from wagtail.wagtailsearch.backends.base import FilterError + from wagtail.search.backends.base import FilterError with self.assertRaises(FilterError): list(self.backend.search("Hello", models.Book.objects.filter(title__iregex='h(ea)llo'))) diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/search/tests/test_backends.py similarity index 96% rename from wagtail/wagtailsearch/tests/test_backends.py rename to wagtail/search/tests/test_backends.py index 7ed7ad0566..9ce8c99f1c 100644 --- a/wagtail/wagtailsearch/tests/test_backends.py +++ b/wagtail/search/tests/test_backends.py @@ -13,10 +13,10 @@ from django.test.utils import override_settings from wagtail.tests.search import models from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailsearch.backends import ( +from wagtail.search.backends import ( InvalidSearchBackendError, get_search_backend, get_search_backends) -from wagtail.wagtailsearch.backends.base import FieldError -from wagtail.wagtailsearch.backends.db import DatabaseSearchBackend +from wagtail.search.backends.base import FieldError +from wagtail.search.backends.db import DatabaseSearchBackend class BackendTests(WagtailTestUtils): @@ -433,7 +433,7 @@ class BackendTests(WagtailTestUtils): @override_settings( WAGTAILSEARCH_BACKENDS={ - 'default': {'BACKEND': 'wagtail.wagtailsearch.backends.db'} + 'default': {'BACKEND': 'wagtail.search.backends.db'} } ) class TestBackendLoader(TestCase): @@ -442,16 +442,16 @@ class TestBackendLoader(TestCase): self.assertIsInstance(db, DatabaseSearchBackend) def test_import_by_path(self): - db = get_search_backend(backend='wagtail.wagtailsearch.backends.db') + db = get_search_backend(backend='wagtail.search.backends.db') self.assertIsInstance(db, DatabaseSearchBackend) def test_import_by_full_path(self): - db = get_search_backend(backend='wagtail.wagtailsearch.backends.db.DatabaseSearchBackend') + db = get_search_backend(backend='wagtail.search.backends.db.DatabaseSearchBackend') self.assertIsInstance(db, DatabaseSearchBackend) def test_nonexistent_backend_import(self): self.assertRaises( - InvalidSearchBackendError, get_search_backend, backend='wagtail.wagtailsearch.backends.doesntexist' + InvalidSearchBackendError, get_search_backend, backend='wagtail.search.backends.doesntexist' ) def test_invalid_backend_import(self): @@ -475,10 +475,10 @@ class TestBackendLoader(TestCase): @override_settings( WAGTAILSEARCH_BACKENDS={ 'default': { - 'BACKEND': 'wagtail.wagtailsearch.backends.db' + 'BACKEND': 'wagtail.search.backends.db' }, 'another-backend': { - 'BACKEND': 'wagtail.wagtailsearch.backends.db' + 'BACKEND': 'wagtail.search.backends.db' }, } ) @@ -496,7 +496,7 @@ class TestBackendLoader(TestCase): @override_settings( WAGTAILSEARCH_BACKENDS={ 'default': { - 'BACKEND': 'wagtail.wagtailsearch.backends.db', + 'BACKEND': 'wagtail.search.backends.db', 'AUTO_UPDATE': False, }, } @@ -509,7 +509,7 @@ class TestBackendLoader(TestCase): @override_settings( WAGTAILSEARCH_BACKENDS={ 'default': { - 'BACKEND': 'wagtail.wagtailsearch.backends.db', + 'BACKEND': 'wagtail.search.backends.db', 'AUTO_UPDATE': False, }, } diff --git a/wagtail/wagtailsearch/tests/test_db_backend.py b/wagtail/search/tests/test_db_backend.py similarity index 96% rename from wagtail/wagtailsearch/tests/test_db_backend.py rename to wagtail/search/tests/test_db_backend.py index 5344bac775..924c9bc805 100644 --- a/wagtail/wagtailsearch/tests/test_db_backend.py +++ b/wagtail/search/tests/test_db_backend.py @@ -8,7 +8,7 @@ from .test_backends import BackendTests class TestDBBackend(BackendTests, TestCase): - backend_path = 'wagtail.wagtailsearch.backends.db' + backend_path = 'wagtail.search.backends.db' # Doesn't support ranking @unittest.expectedFailure diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py b/wagtail/search/tests/test_elasticsearch2_backend.py similarity index 99% rename from wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py rename to wagtail/search/tests/test_elasticsearch2_backend.py index ce23fd2979..4c146e4a32 100644 --- a/wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py +++ b/wagtail/search/tests/test_elasticsearch2_backend.py @@ -11,7 +11,7 @@ from django.test import TestCase from elasticsearch.serializer import JSONSerializer from wagtail.tests.search import models -from wagtail.wagtailsearch.backends.elasticsearch2 import ( +from wagtail.search.backends.elasticsearch2 import ( Elasticsearch2SearchBackend, get_model_root) from .elasticsearch_common_tests import ElasticsearchCommonSearchBackendTests @@ -19,7 +19,7 @@ from .test_backends import BackendTests class TestElasticsearch2SearchBackend(BackendTests, ElasticsearchCommonSearchBackendTests, TestCase): - backend_path = 'wagtail.wagtailsearch.backends.elasticsearch2' + backend_path = 'wagtail.search.backends.elasticsearch2' # Broken @unittest.expectedFailure diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch5_backend.py b/wagtail/search/tests/test_elasticsearch5_backend.py similarity index 99% rename from wagtail/wagtailsearch/tests/test_elasticsearch5_backend.py rename to wagtail/search/tests/test_elasticsearch5_backend.py index 8382a140a2..f1a163fcf2 100644 --- a/wagtail/wagtailsearch/tests/test_elasticsearch5_backend.py +++ b/wagtail/search/tests/test_elasticsearch5_backend.py @@ -11,14 +11,14 @@ from django.test import TestCase from elasticsearch.serializer import JSONSerializer from wagtail.tests.search import models -from wagtail.wagtailsearch.backends.elasticsearch5 import Elasticsearch5SearchBackend +from wagtail.search.backends.elasticsearch5 import Elasticsearch5SearchBackend from .elasticsearch_common_tests import ElasticsearchCommonSearchBackendTests from .test_backends import BackendTests class TestElasticsearch5SearchBackend(BackendTests, ElasticsearchCommonSearchBackendTests, TestCase): - backend_path = 'wagtail.wagtailsearch.backends.elasticsearch5' + backend_path = 'wagtail.search.backends.elasticsearch5' # Broken @unittest.expectedFailure diff --git a/wagtail/wagtailsearch/tests/test_frontend.py b/wagtail/search/tests/test_frontend.py similarity index 99% rename from wagtail/wagtailsearch/tests/test_frontend.py rename to wagtail/search/tests/test_frontend.py index f7f33f20e5..75d67bdc8c 100644 --- a/wagtail/wagtailsearch/tests/test_frontend.py +++ b/wagtail/search/tests/test_frontend.py @@ -6,7 +6,7 @@ from django.urls import reverse from wagtail.tests.testapp.models import EventPage from wagtail.core.models import Page -from wagtail.wagtailsearch.models import Query +from wagtail.search.models import Query class TestSearchView(TestCase): diff --git a/wagtail/wagtailsearch/tests/test_index_functions.py b/wagtail/search/tests/test_index_functions.py similarity index 92% rename from wagtail/wagtailsearch/tests/test_index_functions.py rename to wagtail/search/tests/test_index_functions.py index 809e5c4273..875d4401ce 100644 --- a/wagtail/wagtailsearch/tests/test_index_functions.py +++ b/wagtail/search/tests/test_index_functions.py @@ -9,7 +9,7 @@ from wagtail.tests.search import models from wagtail.tests.testapp.models import SimplePage from wagtail.tests.utils import WagtailTestUtils from wagtail.core.models import Page -from wagtail.wagtailsearch import index +from wagtail.search import index class TestGetIndexedInstance(TestCase): @@ -43,10 +43,10 @@ class TestGetIndexedInstance(TestCase): self.assertEqual(indexed_instance, None) -@mock.patch('wagtail.wagtailsearch.tests.DummySearchBackend', create=True) +@mock.patch('wagtail.search.tests.DummySearchBackend', create=True) @override_settings(WAGTAILSEARCH_BACKENDS={ 'default': { - 'BACKEND': 'wagtail.wagtailsearch.tests.DummySearchBackend' + 'BACKEND': 'wagtail.search.tests.DummySearchBackend' } }) class TestInsertOrUpdateObject(TestCase, WagtailTestUtils): @@ -95,10 +95,10 @@ class TestInsertOrUpdateObject(TestCase, WagtailTestUtils): self.assertIn("ValueError: Test", cm.output[0]) -@mock.patch('wagtail.wagtailsearch.tests.DummySearchBackend', create=True) +@mock.patch('wagtail.search.tests.DummySearchBackend', create=True) @override_settings(WAGTAILSEARCH_BACKENDS={ 'default': { - 'BACKEND': 'wagtail.wagtailsearch.tests.DummySearchBackend' + 'BACKEND': 'wagtail.search.tests.DummySearchBackend' } }) class TestRemoveObject(TestCase, WagtailTestUtils): @@ -133,10 +133,10 @@ class TestRemoveObject(TestCase, WagtailTestUtils): self.assertIn("ValueError: Test", cm.output[0]) -@mock.patch('wagtail.wagtailsearch.tests.DummySearchBackend', create=True) +@mock.patch('wagtail.search.tests.DummySearchBackend', create=True) @override_settings(WAGTAILSEARCH_BACKENDS={ 'default': { - 'BACKEND': 'wagtail.wagtailsearch.tests.DummySearchBackend' + 'BACKEND': 'wagtail.search.tests.DummySearchBackend' } }) class TestSignalHandlers(TestCase, WagtailTestUtils): diff --git a/wagtail/wagtailsearch/tests/test_indexed_class.py b/wagtail/search/tests/test_indexed_class.py similarity index 98% rename from wagtail/wagtailsearch/tests/test_indexed_class.py rename to wagtail/search/tests/test_indexed_class.py index a3e8645c9c..41d9771855 100644 --- a/wagtail/wagtailsearch/tests/test_indexed_class.py +++ b/wagtail/search/tests/test_indexed_class.py @@ -6,7 +6,7 @@ from django.core import checks from django.test import TestCase from wagtail.tests.search import models -from wagtail.wagtailsearch import index +from wagtail.search import index @contextmanager diff --git a/wagtail/wagtailsearch/tests/test_queries.py b/wagtail/search/tests/test_queries.py similarity index 98% rename from wagtail/wagtailsearch/tests/test_queries.py rename to wagtail/search/tests/test_queries.py index 140bb40cef..056b545cd8 100644 --- a/wagtail/wagtailsearch/tests/test_queries.py +++ b/wagtail/search/tests/test_queries.py @@ -8,8 +8,8 @@ from django.test import SimpleTestCase, TestCase from wagtail.contrib.wagtailsearchpromotions.models import SearchPromotion from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailsearch import models -from wagtail.wagtailsearch.utils import normalise_query_string, separate_filters_from_query +from wagtail.search import models +from wagtail.search.utils import normalise_query_string, separate_filters_from_query class TestHitCounter(TestCase): diff --git a/wagtail/wagtailsearch/tests/test_related_fields.py b/wagtail/search/tests/test_related_fields.py similarity index 98% rename from wagtail/wagtailsearch/tests/test_related_fields.py rename to wagtail/search/tests/test_related_fields.py index a1219f5a54..6a012fc2d4 100644 --- a/wagtail/wagtailsearch/tests/test_related_fields.py +++ b/wagtail/search/tests/test_related_fields.py @@ -4,7 +4,7 @@ from django.test import TestCase from wagtail.tests.search.models import Book, Novel from wagtail.tests.testapp.models import Advert, ManyToManyBlogPage -from wagtail.wagtailsearch import index +from wagtail.search import index class TestSelectOnQuerySet(TestCase): diff --git a/wagtail/search/urls/__init__.py b/wagtail/search/urls/__init__.py new file mode 100644 index 0000000000..170fdb2073 --- /dev/null +++ b/wagtail/search/urls/__init__.py @@ -0,0 +1 @@ +from wagtail.search.urls.frontend import urlpatterns # noqa diff --git a/wagtail/wagtailsearch/urls/admin.py b/wagtail/search/urls/admin.py similarity index 86% rename from wagtail/wagtailsearch/urls/admin.py rename to wagtail/search/urls/admin.py index a184941955..7b82b0db6a 100644 --- a/wagtail/wagtailsearch/urls/admin.py +++ b/wagtail/search/urls/admin.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import url -from wagtail.wagtailsearch.views import queries +from wagtail.search.views import queries app_name = 'wagtailsearch_admin' urlpatterns = [ diff --git a/wagtail/wagtailsearch/urls/frontend.py b/wagtail/search/urls/frontend.py similarity index 85% rename from wagtail/wagtailsearch/urls/frontend.py rename to wagtail/search/urls/frontend.py index 7cd071caaf..97883288ca 100644 --- a/wagtail/wagtailsearch/urls/frontend.py +++ b/wagtail/search/urls/frontend.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import url -from wagtail.wagtailsearch.views import search +from wagtail.search.views import search app_name = 'wagtailsearch_frontend' urlpatterns = [ diff --git a/wagtail/wagtailsearch/utils.py b/wagtail/search/utils.py similarity index 100% rename from wagtail/wagtailsearch/utils.py rename to wagtail/search/utils.py diff --git a/wagtail/search/views/__init__.py b/wagtail/search/views/__init__.py new file mode 100644 index 0000000000..026d14e4aa --- /dev/null +++ b/wagtail/search/views/__init__.py @@ -0,0 +1 @@ +from wagtail.search.views.frontend import search # noqa diff --git a/wagtail/wagtailsearch/views/frontend.py b/wagtail/search/views/frontend.py similarity index 98% rename from wagtail/wagtailsearch/views/frontend.py rename to wagtail/search/views/frontend.py index 079cf8ea54..c7ad1f245b 100644 --- a/wagtail/wagtailsearch/views/frontend.py +++ b/wagtail/search/views/frontend.py @@ -6,7 +6,7 @@ from django.http import JsonResponse from django.shortcuts import render from wagtail.core import models -from wagtail.wagtailsearch.models import Query +from wagtail.search.models import Query def search( diff --git a/wagtail/wagtailsearch/views/queries.py b/wagtail/search/views/queries.py similarity index 92% rename from wagtail/wagtailsearch/views/queries.py rename to wagtail/search/views/queries.py index 2140d87e46..8c52cc7c05 100644 --- a/wagtail/wagtailsearch/views/queries.py +++ b/wagtail/search/views/queries.py @@ -5,8 +5,8 @@ from django.shortcuts import render from wagtail.utils.pagination import paginate from wagtail.admin.forms import SearchForm from wagtail.admin.modal_workflow import render_modal_workflow -from wagtail.wagtailsearch import models -from wagtail.wagtailsearch.utils import normalise_query_string +from wagtail.search import models +from wagtail.search.utils import normalise_query_string def chooser(request, get_results=False): diff --git a/wagtail/wagtailsearch/wagtail_hooks.py b/wagtail/search/wagtail_hooks.py similarity index 83% rename from wagtail/wagtailsearch/wagtail_hooks.py rename to wagtail/search/wagtail_hooks.py index e8c6fb57dd..5d7dbccfc7 100644 --- a/wagtail/wagtailsearch/wagtail_hooks.py +++ b/wagtail/search/wagtail_hooks.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import include, url from wagtail.core import hooks -from wagtail.wagtailsearch.urls import admin as admin_urls +from wagtail.search.urls import admin as admin_urls @hooks.register('register_admin_urls') diff --git a/wagtail/tests/demosite/models.py b/wagtail/tests/demosite/models.py index 01b6e2b81e..a38405dc79 100644 --- a/wagtail/tests/demosite/models.py +++ b/wagtail/tests/demosite/models.py @@ -16,7 +16,7 @@ from wagtail.core.models import Orderable, Page from wagtail.documents.edit_handlers import DocumentChooserPanel from wagtail.images.api.fields import ImageRenditionField from wagtail.images.edit_handlers import ImageChooserPanel -from wagtail.wagtailsearch import index +from wagtail.search import index # ABSTRACT MODELS diff --git a/wagtail/tests/modeladmintest/migrations/0001_initial.py b/wagtail/tests/modeladmintest/migrations/0001_initial.py index 0e4b028cb0..75276841cd 100644 --- a/wagtail/tests/modeladmintest/migrations/0001_initial.py +++ b/wagtail/tests/modeladmintest/migrations/0001_initial.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion -import wagtail.wagtailsearch.index +import wagtail.search.index class Migration(migrations.Migration): @@ -30,6 +30,6 @@ class Migration(migrations.Migration): ('title', models.CharField(max_length=255)), ('author', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='modeladmintest.Author')), ], - bases=(models.Model, wagtail.wagtailsearch.index.Indexed), + bases=(models.Model, wagtail.search.index.Indexed), ), ] diff --git a/wagtail/tests/modeladmintest/models.py b/wagtail/tests/modeladmintest/models.py index 8d1eba93b0..aa6ab39c48 100644 --- a/wagtail/tests/modeladmintest/models.py +++ b/wagtail/tests/modeladmintest/models.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.db import models from wagtail.core.models import Page -from wagtail.wagtailsearch import index +from wagtail.search import index class Author(models.Model): diff --git a/wagtail/tests/non_root_urls.py b/wagtail/tests/non_root_urls.py index cf744af4b4..340a3e4471 100644 --- a/wagtail/tests/non_root_urls.py +++ b/wagtail/tests/non_root_urls.py @@ -9,7 +9,7 @@ from wagtail.admin import urls as wagtailadmin_urls from wagtail.core import urls as wagtail_urls from wagtail.documents import urls as wagtaildocs_urls from wagtail.images import urls as wagtailimages_urls -from wagtail.wagtailsearch import urls as wagtailsearch_urls +from wagtail.search import urls as wagtailsearch_urls urlpatterns = [ url(r'^admin/', include(wagtailadmin_urls)), diff --git a/wagtail/tests/search/migrations/0001_initial.py b/wagtail/tests/search/migrations/0001_initial.py index 018bcfdb9c..564a8f75c8 100644 --- a/wagtail/tests/search/migrations/0001_initial.py +++ b/wagtail/tests/search/migrations/0001_initial.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion import taggit.managers -import wagtail.wagtailsearch.index +import wagtail.search.index class Migration(migrations.Migration): @@ -24,7 +24,7 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=255)), ('date_of_birth', models.DateField(null=True)), ], - bases=(models.Model, wagtail.wagtailsearch.index.Indexed), + bases=(models.Model, wagtail.search.index.Indexed), ), migrations.CreateModel( name='Book', @@ -34,7 +34,7 @@ class Migration(migrations.Migration): ('publication_date', models.DateField()), ('number_of_pages', models.IntegerField()), ], - bases=(models.Model, wagtail.wagtailsearch.index.Indexed), + bases=(models.Model, wagtail.search.index.Indexed), ), migrations.CreateModel( name='Character', diff --git a/wagtail/tests/search/models.py b/wagtail/tests/search/models.py index 5d9baf68fb..af02fb57cb 100644 --- a/wagtail/tests/search/models.py +++ b/wagtail/tests/search/models.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.db import models from taggit.managers import TaggableManager -from wagtail.wagtailsearch import index +from wagtail.search import index class Author(index.Indexed, models.Model): diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py index 35ea05c79a..6cfa288464 100644 --- a/wagtail/tests/settings.py +++ b/wagtail/tests/settings.py @@ -119,7 +119,7 @@ INSTALLED_APPS = ( 'wagtail.contrib.modeladmin', 'wagtail.contrib.table_block', 'wagtail.wagtailforms', - 'wagtail.wagtailsearch', + 'wagtail.search', 'wagtail.embeds', 'wagtail.images', 'wagtail.wagtailsites', @@ -160,7 +160,7 @@ PASSWORD_HASHERS = ( WAGTAILSEARCH_BACKENDS = { 'default': { - 'BACKEND': 'wagtail.wagtailsearch.backends.db', + 'BACKEND': 'wagtail.search.backends.db', } } @@ -174,9 +174,9 @@ if os.environ.get('DATABASE_ENGINE') == 'django.db.backends.postgresql': if 'ELASTICSEARCH_URL' in os.environ: if os.environ.get('ELASTICSEARCH_VERSION') == '5': - backend = 'wagtail.wagtailsearch.backends.elasticsearch5' + backend = 'wagtail.search.backends.elasticsearch5' elif os.environ.get('ELASTICSEARCH_VERSION') == '2': - backend = 'wagtail.wagtailsearch.backends.elasticsearch2' + backend = 'wagtail.search.backends.elasticsearch2' WAGTAILSEARCH_BACKENDS['elasticsearch'] = { 'BACKEND': backend, diff --git a/wagtail/tests/snippets/migrations/0002_searchablesnippet.py b/wagtail/tests/snippets/migrations/0002_searchablesnippet.py index 563fb6b6e2..851f28b0cd 100644 --- a/wagtail/tests/snippets/migrations/0002_searchablesnippet.py +++ b/wagtail/tests/snippets/migrations/0002_searchablesnippet.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import migrations, models -import wagtail.wagtailsearch.index +import wagtail.search.index class Migration(migrations.Migration): @@ -19,6 +19,6 @@ class Migration(migrations.Migration): ('id', models.AutoField(serialize=False, primary_key=True, auto_created=True, verbose_name='ID')), ('text', models.CharField(max_length=255)), ], - bases=(wagtail.wagtailsearch.index.Indexed, models.Model), + bases=(wagtail.search.index.Indexed, models.Model), ), ] diff --git a/wagtail/tests/snippets/models.py b/wagtail/tests/snippets/models.py index 545fde04d7..002322936c 100644 --- a/wagtail/tests/snippets/models.py +++ b/wagtail/tests/snippets/models.py @@ -6,7 +6,7 @@ from modelcluster.models import ClusterableModel from wagtail.admin.edit_handlers import FieldPanel, InlinePanel from wagtail.core.fields import RichTextField -from wagtail.wagtailsearch import index +from wagtail.search import index from wagtail.wagtailsnippets.models import register_snippet from .forms import FancySnippetForm diff --git a/wagtail/tests/testapp/migrations/0001_initial.py b/wagtail/tests/testapp/migrations/0001_initial.py index 3c3f5a8e85..3cbcad65be 100644 --- a/wagtail/tests/testapp/migrations/0001_initial.py +++ b/wagtail/tests/testapp/migrations/0001_initial.py @@ -13,7 +13,7 @@ import wagtail.core.blocks import wagtail.core.fields import wagtail.images.blocks import wagtail.images.models -import wagtail.wagtailsearch.index +import wagtail.search.index class Migration(migrations.Migration): @@ -145,7 +145,7 @@ class Migration(migrations.Migration): options={ 'abstract': False, }, - bases=(models.Model, wagtail.wagtailsearch.index.Indexed), + bases=(models.Model, wagtail.search.index.Indexed), ), migrations.CreateModel( name='CustomImageFilePath', @@ -167,7 +167,7 @@ class Migration(migrations.Migration): options={ 'abstract': False, }, - bases=(models.Model, wagtail.wagtailsearch.index.Indexed), + bases=(models.Model, wagtail.search.index.Indexed), ), migrations.CreateModel( name='CustomManagerPage', diff --git a/wagtail/tests/testapp/migrations/0020_customdocument.py b/wagtail/tests/testapp/migrations/0020_customdocument.py index a79617a1d2..fc525687ef 100644 --- a/wagtail/tests/testapp/migrations/0020_customdocument.py +++ b/wagtail/tests/testapp/migrations/0020_customdocument.py @@ -7,7 +7,7 @@ from django.db import migrations, models import django.db.models.deletion import taggit.managers import wagtail.core.models -import wagtail.wagtailsearch.index +import wagtail.search.index class Migration(migrations.Migration): @@ -35,6 +35,6 @@ class Migration(migrations.Migration): 'abstract': False, 'verbose_name': 'document', }, - bases=(wagtail.wagtailsearch.index.Indexed, models.Model), + bases=(wagtail.search.index.Indexed, models.Model), ), ] diff --git a/wagtail/tests/testapp/models.py b/wagtail/tests/testapp/models.py index 22813fd9e6..bee303f663 100644 --- a/wagtail/tests/testapp/models.py +++ b/wagtail/tests/testapp/models.py @@ -33,7 +33,7 @@ from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField, Ab 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.search 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 29d2b4ce84..373a79371b 100644 --- a/wagtail/tests/urls.py +++ b/wagtail/tests/urls.py @@ -14,7 +14,7 @@ from wagtail.documents.api.v2.endpoints import DocumentsAPIEndpoint 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 +from wagtail.search import urls as wagtailsearch_urls api_router = WagtailAPIRouter('wagtailapi_v2') api_router.register_endpoint('pages', PagesAPIEndpoint) diff --git a/wagtail/wagtailsearch/__init__.py b/wagtail/wagtailsearch/__init__.py deleted file mode 100644 index ac4f1278af..0000000000 --- a/wagtail/wagtailsearch/__init__.py +++ /dev/null @@ -1 +0,0 @@ -default_app_config = 'wagtail.wagtailsearch.apps.WagtailSearchAppConfig' diff --git a/wagtail/wagtailsearch/urls/__init__.py b/wagtail/wagtailsearch/urls/__init__.py deleted file mode 100644 index 1924c52281..0000000000 --- a/wagtail/wagtailsearch/urls/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from wagtail.wagtailsearch.urls.frontend import urlpatterns # noqa diff --git a/wagtail/wagtailsearch/views/__init__.py b/wagtail/wagtailsearch/views/__init__.py deleted file mode 100644 index f98e0899af..0000000000 --- a/wagtail/wagtailsearch/views/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from wagtail.wagtailsearch.views.frontend import search # noqa diff --git a/wagtail/wagtailsnippets/views/chooser.py b/wagtail/wagtailsnippets/views/chooser.py index fec9e11b64..f9dd7c5c27 100644 --- a/wagtail/wagtailsnippets/views/chooser.py +++ b/wagtail/wagtailsnippets/views/chooser.py @@ -9,8 +9,8 @@ from django.utils.translation import ugettext as _ from wagtail.utils.pagination import paginate from wagtail.admin.forms import SearchForm from wagtail.admin.modal_workflow import render_modal_workflow -from wagtail.wagtailsearch.backends import get_search_backend -from wagtail.wagtailsearch.index import class_is_indexed +from wagtail.search.backends import get_search_backend +from wagtail.search.index import class_is_indexed from wagtail.wagtailsnippets.views.snippets import get_snippet_model_from_url_params diff --git a/wagtail/wagtailsnippets/views/snippets.py b/wagtail/wagtailsnippets/views/snippets.py index c54f46a285..a4d6cfe155 100644 --- a/wagtail/wagtailsnippets/views/snippets.py +++ b/wagtail/wagtailsnippets/views/snippets.py @@ -13,8 +13,8 @@ from wagtail.admin.edit_handlers import ( ObjectList, extract_panel_definitions_from_model_class) from wagtail.admin.forms import SearchForm from wagtail.admin.utils import permission_denied -from wagtail.wagtailsearch.backends import get_search_backend -from wagtail.wagtailsearch.index import class_is_indexed +from wagtail.search.backends import get_search_backend +from wagtail.search.index import class_is_indexed from wagtail.wagtailsnippets.models import get_snippet_models from wagtail.wagtailsnippets.permissions import get_permission_name, user_can_edit_snippet_type