Rename wagtail.wagtaildocs to wagtail.documents

Conflicts:
	docs/advanced_topics/i18n/index.rst
	docs/advanced_topics/settings.rst
	docs/getting_started/integrating_into_django.rst
	gulpfile.js/config.js
	wagtail/admin/tests/test_collections_views.py
	wagtail/api/v2/signal_handlers.py
	wagtail/contrib/wagtailstyleguide/views.py
	wagtail/core/tests/test_collection_permission_policies.py
	wagtail/documents/permissions.py
	wagtail/documents/tests/test_admin_views.py
	wagtail/documents/tests/test_collection_privacy.py
	wagtail/documents/tests/test_models.py
	wagtail/documents/views/chooser.py
	wagtail/documents/views/documents.py
	wagtail/documents/views/serve.py
	wagtail/documents/wagtail_hooks.py
	wagtail/documents/widgets.py
	wagtail/project_template/project_name/urls.py
	wagtail/tests/demosite/models.py
	wagtail/tests/non_root_urls.py
	wagtail/tests/settings.py
	wagtail/tests/testapp/models.py
	wagtail/tests/urls.py

.tx/config

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

docs/advanced_topics/api/v2/configuration.rst

@@ -45,7 +45,7 @@ Wagtail provides three endpoint classes you can use:
 
  - Pages :class:`wagtail.api.v2.endpoints.PagesAPIEndpoint`
  - Images :class:`wagtail.wagtailimages.api.v2.endpoints.ImagesAPIEndpoint`
- - Documents :class:`wagtail.wagtaildocs.api.v2.endpoints.DocumentsAPIEndpoint`
+ - Documents :class:`wagtail.documents.api.v2.endpoints.DocumentsAPIEndpoint`
 
 You can subclass any of these endpoint classes to customise their functionality.
 Additionally, there is a base endpoint class you can use for adding different
@@ -61,7 +61,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.wagtaildocs.api.v2.endpoints import DocumentsAPIEndpoint
+    from wagtail.documents.api.v2.endpoints import DocumentsAPIEndpoint
 
     # Create the router. "wagtailapi" is the URL namespace
     api_router = WagtailAPIRouter('wagtailapi')

docs/advanced_topics/documents/custom_document_model.rst

@@ -8,7 +8,7 @@ additional fields.
 You need to complete the following steps in your project to do this:
 
  - Create a new document model that inherits from
-   ``wagtail.wagtaildocs.models.AbstractDocument``. This is where you would
+   ``wagtail.documents.models.AbstractDocument``. This is where you would
    add additional fields.
  - Point ``WAGTAILDOCS_DOCUMENT_MODEL`` to the new model.
 
@@ -17,7 +17,7 @@ Here's an example:
 .. code-block:: python
 
     # models.py
-    from wagtail.wagtaildocs.models import Document, AbstractDocument
+    from wagtail.documents.models import Document, AbstractDocument
 
     class CustomDocument(AbstractDocument):
         # Custom field example:
@@ -62,6 +62,6 @@ Then in your settings module:
 Referring to the document model
 ===============================
 
-.. module:: wagtail.wagtaildocs.models
+.. module:: wagtail.documents.models
 
 .. autofunction:: get_document_model

docs/advanced_topics/i18n/index.rst

@@ -88,7 +88,7 @@ This feature is enabled through the project's root URL configuration. Just put t
     from django.contrib import admin
 
     from wagtail.admin import urls as wagtailadmin_urls
-    from wagtail.wagtaildocs import urls as wagtaildocs_urls
+    from wagtail.documents import urls as wagtaildocs_urls
     from wagtail.core import urls as wagtail_urls
 
 

docs/advanced_topics/settings.rst

@@ -66,7 +66,7 @@ Apps (``settings.py``)
     'wagtail.wagtailsites',
     'wagtail.wagtailusers',
     'wagtail.wagtailsnippets',
-    'wagtail.wagtaildocs',
+    'wagtail.documents',
     'wagtail.wagtailimages',
     'wagtail.wagtailsearch',
     'wagtail.admin',
@@ -449,7 +449,7 @@ URL Patterns
 
   from wagtail.core import urls as wagtail_urls
   from wagtail.admin import urls as wagtailadmin_urls
-  from wagtail.wagtaildocs import urls as wagtaildocs_urls
+  from wagtail.documents import urls as wagtaildocs_urls
   from wagtail.wagtailsearch import urls as wagtailsearch_urls
 
   urlpatterns = [
@@ -508,7 +508,7 @@ These two files should reside in your project directory (``myproject/myproject/`
       'wagtail.wagtailsites',
       'wagtail.wagtailusers',
       'wagtail.wagtailsnippets',
-      'wagtail.wagtaildocs',
+      'wagtail.documents',
       'wagtail.wagtailimages',
       'wagtail.wagtailsearch',
       'wagtail.admin',
@@ -692,7 +692,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.wagtaildocs import urls as wagtaildocs_urls
+  from wagtail.documents import urls as wagtaildocs_urls
   from wagtail.wagtailsearch import urls as wagtailsearch_urls
 
 

docs/getting_started/integrating_into_django.rst

@@ -26,7 +26,7 @@ In your settings file, add the following apps to ``INSTALLED_APPS``:
     'wagtail.wagtailsites',
     'wagtail.wagtailusers',
     'wagtail.wagtailsnippets',
-    'wagtail.wagtaildocs',
+    'wagtail.documents',
     'wagtail.wagtailimages',
     'wagtail.wagtailsearch',
     'wagtail.admin',
@@ -64,7 +64,7 @@ Now make the following additions to your ``urls.py`` file:
 .. code-block:: python
 
     from wagtail.admin import urls as wagtailadmin_urls
-    from wagtail.wagtaildocs import urls as wagtaildocs_urls
+    from wagtail.documents import urls as wagtaildocs_urls
     from wagtail.core import urls as wagtail_urls
 
     urlpatterns = [

docs/reference/contrib/modeladmin/inspectview.rst

@@ -37,7 +37,7 @@ instance of ``wagtailimages.models.Image`` (or a custom model that subclasses
 ``wagtailimages.models.AbstractImage``), a thumbnail of that image will be
 rendered.
 
-If you have `wagtail.wagtaildocs` installed, and the value happens to be an
+If you have `wagtail.documents` installed, and the value happens to be an
 instance of `wagtaildocs.models.Document` (or a custom model that subclasses
 ``wagtaildocs.models.AbstractDocument``), a link to that document will be
 rendered, along with the document title, file extension and size.

docs/reference/pages/panels.rst

@@ -183,16 +183,16 @@ FormSubmissionsPanel
 DocumentChooserPanel
 --------------------
 
-.. module:: wagtail.wagtaildocs.edit_handlers
+.. module:: wagtail.documents.edit_handlers
 
 .. class:: DocumentChooserPanel(field_name)
 
-    For files in other formats, Wagtail provides a generic file store through the :class:`~wagtail.wagtaildocs.models.Document` model:
+    For files in other formats, Wagtail provides a generic file store through the :class:`~wagtail.documents.models.Document` model:
 
     .. code-block:: python
 
-      from wagtail.wagtaildocs.models import Document
-      from wagtail.wagtaildocs.edit_handlers import DocumentChooserPanel
+      from wagtail.documents.models import Document
+      from wagtail.documents.edit_handlers import DocumentChooserPanel
 
 
       class BookPage(Page):

docs/topics/pages.rst

@@ -160,7 +160,7 @@ These are used for structuring fields in the interface.
 
  - :class:`~wagtail.admin.edit_handlers.PageChooserPanel`
  - :class:`~wagtail.wagtailimages.edit_handlers.ImageChooserPanel`
- - :class:`~wagtail.wagtaildocs.edit_handlers.DocumentChooserPanel`
+ - :class:`~wagtail.documents.edit_handlers.DocumentChooserPanel`
  - :class:`~wagtail.wagtailsnippets.edit_handlers.SnippetChooserPanel`
 
 .. note::

docs/topics/streamfield.rst

@@ -270,7 +270,7 @@ A control for selecting a page object, using Wagtail's page browser. The followi
 DocumentChooserBlock
 ~~~~~~~~~~~~~~~~~~~~
 
-``wagtail.wagtaildocs.blocks.DocumentChooserBlock``
+``wagtail.documents.blocks.DocumentChooserBlock``
 
 A control to allow the editor to select an existing document object, or upload a new one. The keyword argument ``required`` (default: True) is accepted.
 

gulpfile.js/config.js

@@ -24,7 +24,7 @@ App.prototype.scssSources = function() {
 // All the Wagtail apps that contain static files
 var apps = [
     new App('wagtail/admin'),
-    new App('wagtail/wagtaildocs'),
+    new App('wagtail/documents'),
     new App('wagtail/wagtailembeds'),
     new App('wagtail/wagtailimages'),
     new App('wagtail/wagtailsnippets'),

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.wagtaildocs wagtail.wagtailimages --elasticsearch2
-    elasticsearch5: coverage run runtests.py wagtail.wagtailsearch wagtail.wagtaildocs wagtail.wagtailimages --elasticsearch5
+    elasticsearch2: coverage run runtests.py wagtail.wagtailsearch wagtail.documents wagtail.wagtailimages --elasticsearch2
+    elasticsearch5: coverage run runtests.py wagtail.wagtailsearch wagtail.documents wagtail.wagtailimages --elasticsearch5
     noelasticsearch: coverage run runtests.py
 
 basepython =

wagtail/admin/tests/api/test_documents.py

@@ -5,7 +5,7 @@ import json
 from django.urls import reverse
 
 from wagtail.api.v2.tests.test_documents import TestDocumentDetail, TestDocumentListing
-from wagtail.wagtaildocs.models import Document
+from wagtail.documents.models import Document
 
 from .utils import AdminAPITestCase
 

wagtail/admin/tests/test_collections_views.py

@@ -5,7 +5,7 @@ from django.urls import reverse
 
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.core.models import Collection
-from wagtail.wagtaildocs.models import Document
+from wagtail.documents.models import Document
 
 
 class TestCollectionsIndexView(TestCase, WagtailTestUtils):

wagtail/api/v2/signal_handlers.py

@@ -6,7 +6,7 @@ from django.urls import reverse
 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.wagtaildocs.models import get_document_model
+from wagtail.documents.models import get_document_model
 from wagtail.wagtailimages import get_image_model
 
 from .utils import get_base_url

wagtail/api/v2/tests/test_documents.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.wagtaildocs.models import get_document_model
+from wagtail.documents.models import get_document_model
 
 
 class TestDocumentListing(TestCase):

wagtail/contrib/modeladmin/views.py

@@ -880,7 +880,7 @@ class InspectView(InstanceSpecificView):
 
         # wagtail.wagtaildocuments might not be installed
         try:
-            from wagtail.wagtaildocs.models import AbstractDocument
+            from wagtail.documents.models import AbstractDocument
             if isinstance(val, AbstractDocument):
                 # Render a link to the document
                 return self.get_document_field_display(field_name, field)

wagtail/contrib/wagtailstyleguide/views.py

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

wagtail/core/tests/test_collection_permission_policies.py

@@ -9,7 +9,7 @@ from wagtail.core.models import Collection, GroupCollectionPermission
 from wagtail.core.permission_policies.collections import (
     CollectionOwnershipPermissionPolicy, CollectionPermissionPolicy)
 from wagtail.core.tests.test_permission_policies import PermissionPolicyTestUtils
-from wagtail.wagtaildocs.models import Document
+from wagtail.documents.models import Document
 
 
 class PermissionPolicyTestCase(PermissionPolicyTestUtils, TestCase):

wagtail/documents/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'wagtail.documents.apps.WagtailDocsAppConfig'

wagtail/documents/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.wagtaildocs.models import Document
+from wagtail.documents.models import Document
 
 if hasattr(settings, 'WAGTAILDOCS_DOCUMENT_MODEL') and settings.WAGTAILDOCS_DOCUMENT_MODEL != 'wagtaildocs.Document':
     # This installation provides its own custom document class;

wagtail/documents/admin_urls.py

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

wagtail/documents/apps.py

@@ -4,10 +4,10 @@ from django.apps import AppConfig
 
 
 class WagtailDocsAppConfig(AppConfig):
-    name = 'wagtail.wagtaildocs'
+    name = 'wagtail.documents'
     label = 'wagtaildocs'
     verbose_name = "Wagtail documents"
 
     def ready(self):
-        from wagtail.wagtaildocs.signal_handlers import register_signal_handlers
+        from wagtail.documents.signal_handlers import register_signal_handlers
         register_signal_handlers()

wagtail/documents/blocks.py

@@ -9,12 +9,12 @@ from wagtail.core.blocks import ChooserBlock
 class DocumentChooserBlock(ChooserBlock):
     @cached_property
     def target_model(self):
-        from wagtail.wagtaildocs.models import get_document_model
+        from wagtail.documents.models import get_document_model
         return get_document_model()
 
     @cached_property
     def widget(self):
-        from wagtail.wagtaildocs.widgets import AdminDocumentChooser
+        from wagtail.documents.widgets import AdminDocumentChooser
         return AdminDocumentChooser
 
     def render_basic(self, value, context=None):

wagtail/documents/forms.py

@@ -7,8 +7,8 @@ from django.utils.translation import ugettext_lazy as _
 from wagtail.admin import widgets
 from wagtail.admin.forms import (
     BaseCollectionMemberForm, collection_member_permission_formset_factory)
-from wagtail.wagtaildocs.models import Document
-from wagtail.wagtaildocs.permissions import permission_policy as documents_permission_policy
+from wagtail.documents.models import Document
+from wagtail.documents.permissions import permission_policy as documents_permission_policy
 
 
 class BaseDocumentForm(BaseCollectionMemberForm):