From 4300e19da22107f12d5024853a36d71191af7c72 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 17 Nov 2017 10:23:27 +0000 Subject: [PATCH] Rename wagtail.wagtailcore to wagtail.core --- .tx/config | 4 +- .../customisation/admin_templates.rst | 2 +- .../customisation/page_editing_interface.rst | 16 ++--- docs/advanced_topics/i18n/duplicate_tree.rst | 4 +- docs/advanced_topics/i18n/index.rst | 2 +- docs/advanced_topics/jinja2.rst | 2 +- docs/advanced_topics/settings.rst | 12 ++-- docs/contributing/developing.rst | 4 +- .../integrating_into_django.rst | 6 +- docs/getting_started/tutorial.rst | 20 +++---- .../reference/contrib/forms/customisation.rst | 12 ++-- docs/reference/contrib/forms/index.rst | 2 +- docs/reference/contrib/frontendcache.rst | 2 +- docs/reference/contrib/routablepage.rst | 8 +-- docs/reference/hooks.rst | 48 +++++++-------- docs/reference/pages/index.rst | 2 +- docs/reference/pages/model_recipes.rst | 18 +++--- docs/reference/pages/model_reference.rst | 20 +++---- docs/reference/pages/panels.rst | 8 +-- docs/reference/pages/queryset_reference.rst | 6 +- docs/reference/signals.rst | 6 +- docs/releases/0.4.rst | 4 +- docs/releases/1.11.rst | 4 +- docs/releases/1.2.rst | 4 +- docs/releases/1.3.rst | 2 +- docs/releases/1.6.1.rst | 2 +- docs/releases/1.8.rst | 2 +- docs/topics/pages.rst | 32 +++++----- docs/topics/search/searching.rst | 4 +- docs/topics/snippets.rst | 2 +- docs/topics/streamfield.rst | 56 +++++++++--------- wagtail/api/v2/endpoints.py | 2 +- wagtail/api/v2/filters.py | 4 +- wagtail/api/v2/serializers.py | 2 +- wagtail/api/v2/signal_handlers.py | 4 +- wagtail/api/v2/tests/test_pages.py | 2 +- wagtail/api/v2/utils.py | 4 +- wagtail/contrib/modeladmin/forms.py | 2 +- .../contrib/modeladmin/helpers/permission.py | 2 +- wagtail/contrib/modeladmin/options.py | 4 +- .../modeladmin/tests/test_page_modeladmin.py | 2 +- wagtail/contrib/settings/forms.py | 2 +- wagtail/contrib/settings/jinja2tags.py | 2 +- wagtail/contrib/settings/registry.py | 2 +- .../templatetags/wagtailsettings_tags.py | 2 +- wagtail/contrib/settings/tests/test_admin.py | 4 +- .../contrib/settings/tests/test_templates.py | 2 +- wagtail/contrib/settings/views.py | 2 +- wagtail/contrib/settings/wagtail_hooks.py | 2 +- wagtail/contrib/table_block/blocks.py | 2 +- .../wagtailfrontendcache/signal_handlers.py | 2 +- wagtail/contrib/wagtailfrontendcache/tests.py | 2 +- wagtail/contrib/wagtailroutablepage/models.py | 4 +- wagtail/contrib/wagtailroutablepage/tests.py | 4 +- .../wagtailsearchpromotions/wagtail_hooks.py | 2 +- wagtail/contrib/wagtailsitemaps/tests.py | 2 +- wagtail/contrib/wagtailstyleguide/views.py | 2 +- .../wagtailstyleguide/wagtail_hooks.py | 2 +- wagtail/{wagtailcore => core}/__init__.py | 2 +- wagtail/{wagtailcore => core}/admin.py | 2 +- wagtail/{wagtailcore => core}/apps.py | 4 +- .../{wagtailcore => core}/blocks/__init__.py | 2 +- wagtail/{wagtailcore => core}/blocks/base.py | 4 +- .../blocks/field_block.py | 8 +-- .../blocks/list_block.py | 4 +- .../blocks/static_block.py | 0 .../blocks/stream_block.py | 4 +- .../blocks/struct_block.py | 2 +- wagtail/{wagtailcore => core}/blocks/utils.py | 0 wagtail/{wagtailcore => core}/compat.py | 0 wagtail/{wagtailcore => core}/fields.py | 2 +- wagtail/{wagtailcore => core}/forms.py | 0 wagtail/{wagtailcore => core}/hooks.py | 0 wagtail/{wagtailcore => core}/jinja2tags.py | 0 .../locale/ar/LC_MESSAGES/django.mo | Bin .../locale/ar/LC_MESSAGES/django.po | 0 .../locale/bg/LC_MESSAGES/django.mo | Bin .../locale/bg/LC_MESSAGES/django.po | 0 .../locale/ca/LC_MESSAGES/django.mo | Bin .../locale/ca/LC_MESSAGES/django.po | 0 .../locale/cs/LC_MESSAGES/django.mo | Bin .../locale/cs/LC_MESSAGES/django.po | 0 .../locale/de/LC_MESSAGES/django.mo | Bin .../locale/de/LC_MESSAGES/django.po | 0 .../locale/el/LC_MESSAGES/django.mo | Bin .../locale/el/LC_MESSAGES/django.po | 0 .../locale/en/LC_MESSAGES/django.mo | Bin .../locale/en/LC_MESSAGES/django.po | 0 .../locale/es/LC_MESSAGES/django.mo | Bin .../locale/es/LC_MESSAGES/django.po | 0 .../locale/fa/LC_MESSAGES/django.mo | Bin .../locale/fa/LC_MESSAGES/django.po | 0 .../locale/fi/LC_MESSAGES/django.mo | Bin .../locale/fi/LC_MESSAGES/django.po | 0 .../locale/fr/LC_MESSAGES/django.mo | Bin .../locale/fr/LC_MESSAGES/django.po | 0 .../locale/gl/LC_MESSAGES/django.mo | Bin .../locale/gl/LC_MESSAGES/django.po | 0 .../locale/he_IL/LC_MESSAGES/django.mo | Bin .../locale/he_IL/LC_MESSAGES/django.po | 0 .../locale/hu/LC_MESSAGES/django.mo | Bin .../locale/hu/LC_MESSAGES/django.po | 0 .../locale/id_ID/LC_MESSAGES/django.mo | Bin .../locale/id_ID/LC_MESSAGES/django.po | 0 .../locale/is_IS/LC_MESSAGES/django.mo | Bin .../locale/is_IS/LC_MESSAGES/django.po | 0 .../locale/it/LC_MESSAGES/django.mo | Bin .../locale/it/LC_MESSAGES/django.po | 0 .../locale/ja/LC_MESSAGES/django.mo | Bin .../locale/ja/LC_MESSAGES/django.po | 0 .../locale/ka/LC_MESSAGES/django.mo | Bin .../locale/ka/LC_MESSAGES/django.po | 0 .../locale/ko/LC_MESSAGES/django.mo | Bin .../locale/ko/LC_MESSAGES/django.po | 0 .../locale/lt/LC_MESSAGES/django.mo | Bin .../locale/lt/LC_MESSAGES/django.po | 0 .../locale/lv/LC_MESSAGES/django.mo | Bin .../locale/lv/LC_MESSAGES/django.po | 0 .../locale/nb/LC_MESSAGES/django.mo | Bin .../locale/nb/LC_MESSAGES/django.po | 0 .../locale/nl/LC_MESSAGES/django.mo | Bin .../locale/nl/LC_MESSAGES/django.po | 0 .../locale/nl_NL/LC_MESSAGES/django.mo | Bin .../locale/nl_NL/LC_MESSAGES/django.po | 0 .../locale/pl/LC_MESSAGES/django.mo | Bin .../locale/pl/LC_MESSAGES/django.po | 0 .../locale/pt_BR/LC_MESSAGES/django.mo | Bin .../locale/pt_BR/LC_MESSAGES/django.po | 0 .../locale/pt_PT/LC_MESSAGES/django.mo | Bin .../locale/pt_PT/LC_MESSAGES/django.po | 0 .../locale/ro/LC_MESSAGES/django.mo | Bin .../locale/ro/LC_MESSAGES/django.po | 0 .../locale/ru/LC_MESSAGES/django.mo | Bin .../locale/ru/LC_MESSAGES/django.po | 0 .../locale/sk_SK/LC_MESSAGES/django.mo | Bin .../locale/sk_SK/LC_MESSAGES/django.po | 0 .../locale/sl/LC_MESSAGES/django.mo | Bin .../locale/sl/LC_MESSAGES/django.po | 0 .../locale/sv/LC_MESSAGES/django.mo | Bin .../locale/sv/LC_MESSAGES/django.po | 0 .../locale/tr/LC_MESSAGES/django.mo | Bin .../locale/tr/LC_MESSAGES/django.po | 0 .../locale/uk/LC_MESSAGES/django.mo | Bin .../locale/uk/LC_MESSAGES/django.po | 0 .../locale/zh/LC_MESSAGES/django.mo | Bin .../locale/zh/LC_MESSAGES/django.po | 0 .../locale/zh_CN/LC_MESSAGES/django.mo | Bin .../locale/zh_CN/LC_MESSAGES/django.po | 0 .../management/__init__.py | 0 .../management/commands/__init__.py | 0 .../management/commands/fixtree.py | 2 +- .../management/commands/move_pages.py | 2 +- .../commands/publish_scheduled_pages.py | 2 +- .../management/commands/replace_text.py | 2 +- .../management/commands/set_url_paths.py | 2 +- wagtail/{wagtailcore => core}/middleware.py | 2 +- .../migrations/0001_initial.py | 0 ...0016_change_page_url_path_to_text_field.py | 0 .../migrations/0002_initial_data.py | 0 ...ess_constraint_on_group_page_permission.py | 0 .../migrations/0004_page_locked.py | 0 ..._add_page_lock_permission_to_moderators.py | 0 .../0006_add_lock_page_permission.py | 0 .../0007_page_latest_revision_created_at.py | 0 ...008_populate_latest_revision_created_at.py | 0 ...to_now_add_from_pagerevision_created_at.py | 0 ...010_change_page_owner_to_null_on_delete.py | 0 .../0011_page_first_published_at.py | 0 .../migrations/0012_extend_page_slug_field.py | 0 .../0013_update_golive_expire_help_text.py | 0 .../migrations/0014_add_verbose_name.py | 0 .../migrations/0015_add_more_verbose_names.py | 0 ...0016_change_page_url_path_to_text_field.py | 0 ...change_edit_page_permission_description.py | 0 ...revision_submitted_for_moderation_index.py | 0 .../migrations/0019_verbose_names_cleanup.py | 0 ...20_add_index_on_page_first_published_at.py | 0 .../migrations/0021_capitalizeverbose.py | 0 .../migrations/0022_add_site_name.py | 0 ...alter_page_revision_on_delete_behaviour.py | 0 ...r_page_content_type_on_delete_behaviour.py | 4 +- .../migrations/0024_collection.py | 0 .../0025_collection_initial_data.py | 0 .../0026_group_collection_permission.py | 0 .../0027_fix_collection_path_collation.py | 0 .../migrations/0028_merge.py | 0 .../migrations/0029_unicode_slugfield_dj19.py | 0 .../0030_index_on_pagerevision_created_at.py | 0 .../0031_add_page_view_restriction_types.py | 0 .../0032_add_bulk_delete_page_permission.py | 0 .../0033_remove_golive_expiry_help_text.py | 0 .../migrations/0034_page_live_revision.py | 0 .../migrations/0035_page_last_published_at.py | 0 .../0036_populate_page_last_published_at.py | 0 .../0037_set_page_owner_editable.py | 0 .../0038_make_first_published_at_editable.py | 0 .../0039_collectionviewrestriction.py | 0 .../migrations/0040_page_draft_title.py | 0 .../migrations/__init__.py | 0 wagtail/{wagtailcore => core}/models.py | 12 ++-- .../permission_policies/__init__.py | 0 .../permission_policies/base.py | 0 .../permission_policies/collections.py | 2 +- wagtail/{wagtailcore => core}/permissions.py | 4 +- wagtail/{wagtailcore => core}/query.py | 2 +- wagtail/{wagtailcore => core}/rich_text.py | 6 +- .../{wagtailcore => core}/signal_handlers.py | 2 +- wagtail/{wagtailcore => core}/signals.py | 0 wagtail/{wagtailcore => core}/sites.py | 0 .../templates/wagtailcore/login.html | 0 .../templates/wagtailcore/page.html | 0 .../wagtailcore/password_required.html | 0 .../templatetags/__init__.py | 0 .../templatetags/wagtailcore_tags.py | 4 +- .../{wagtailcore => core}/tests/__init__.py | 0 .../tests/test_blocks.py | 22 +++---- .../tests/test_collection_model.py | 2 +- .../test_collection_permission_policies.py | 6 +- .../tests/test_dbwhitelister.py | 4 +- .../{wagtailcore => core}/tests/test_hooks.py | 2 +- .../tests/test_jinja2.py | 4 +- .../tests/test_management_commands.py | 4 +- .../tests/test_migrations.py | 0 .../tests/test_page_model.py | 2 +- .../tests/test_page_permissions.py | 2 +- .../tests/test_page_privacy.py | 2 +- .../tests/test_page_queryset.py | 4 +- .../tests/test_permission_policies.py | 2 +- .../tests/test_rich_text.py | 4 +- .../{wagtailcore => core}/tests/test_sites.py | 2 +- .../tests/test_streamfield.py | 10 ++-- .../{wagtailcore => core}/tests/test_tests.py | 2 +- .../{wagtailcore => core}/tests/test_utils.py | 2 +- .../{wagtailcore => core}/tests/test_views.py | 2 +- .../tests/test_whitelist.py | 2 +- wagtail/{wagtailcore => core}/tests/tests.py | 8 +-- wagtail/{wagtailcore => core}/url_routing.py | 0 wagtail/{wagtailcore => core}/urls.py | 4 +- wagtail/{wagtailcore => core}/utils.py | 0 wagtail/{wagtailcore => core}/views.py | 8 +-- .../{wagtailcore => core}/wagtail_hooks.py | 6 +- wagtail/{wagtailcore => core}/whitelist.py | 0 wagtail/project_template/home/models.py | 2 +- .../project_name/settings/base.py | 4 +- wagtail/project_template/project_name/urls.py | 2 +- wagtail/project_template/search/views.py | 2 +- .../tests/demosite/migrations/0001_initial.py | 24 ++++---- wagtail/tests/demosite/models.py | 4 +- wagtail/tests/modeladmintest/models.py | 2 +- wagtail/tests/non_root_urls.py | 2 +- wagtail/tests/settings.py | 6 +- ...isectionrichtextsnippet_richtextsection.py | 4 +- wagtail/tests/snippets/models.py | 2 +- wagtail/tests/testapp/blocks.py | 2 +- .../tests/testapp/migrations/0001_initial.py | 14 ++--- .../0002_customimage_collections.py | 6 +- ...blockfieldpage_defaultrichtextfieldpage.py | 12 ++-- ...chtextpage_sectionedrichtextpagesection.py | 4 +- ...nlinestreampage_inlinestreampagesection.py | 6 +- .../migrations/0009_defaultstreampage.py | 6 +- .../migrations/0010_auto_20160823_1056.py | 6 +- .../migrations/0013_auto_20161220_1957.py | 6 +- .../0019_richtextfieldwithfeaturespage.py | 4 +- .../testapp/migrations/0020_customdocument.py | 4 +- wagtail/tests/testapp/models.py | 6 +- wagtail/tests/testapp/wagtail_hooks.py | 4 +- wagtail/tests/urls.py | 2 +- wagtail/tests/utils.py | 2 +- wagtail/wagtailadmin/api/endpoints.py | 2 +- wagtail/wagtailadmin/api/serializers.py | 2 +- wagtail/wagtailadmin/api/urls.py | 2 +- wagtail/wagtailadmin/blocks.py | 4 +- wagtail/wagtailadmin/checks.py | 4 +- wagtail/wagtailadmin/edit_handlers.py | 6 +- wagtail/wagtailadmin/forms.py | 2 +- wagtail/wagtailadmin/menu.py | 2 +- wagtail/wagtailadmin/navigation.py | 2 +- wagtail/wagtailadmin/rich_text.py | 2 +- wagtail/wagtailadmin/search.py | 2 +- wagtail/wagtailadmin/site_summary.py | 4 +- .../templatetags/wagtailadmin_tags.py | 8 +-- .../templatetags/wagtailuserbar.py | 4 +- wagtail/wagtailadmin/tests/api/test_pages.py | 2 +- .../wagtailadmin/tests/test_admin_search.py | 2 +- .../wagtailadmin/tests/test_buttons_hooks.py | 4 +- .../tests/test_collections_views.py | 2 +- wagtail/wagtailadmin/tests/test_compare.py | 2 +- .../wagtailadmin/tests/test_edit_handlers.py | 2 +- wagtail/wagtailadmin/tests/test_jinja2.py | 2 +- .../wagtailadmin/tests/test_page_chooser.py | 2 +- .../wagtailadmin/tests/test_pages_views.py | 4 +- wagtail/wagtailadmin/tests/test_privacy.py | 2 +- wagtail/wagtailadmin/tests/test_rich_text.py | 6 +- wagtail/wagtailadmin/tests/test_userbar.py | 2 +- wagtail/wagtailadmin/tests/test_widgets.py | 2 +- wagtail/wagtailadmin/tests/tests.py | 2 +- wagtail/wagtailadmin/urls/__init__.py | 2 +- wagtail/wagtailadmin/utils.py | 2 +- wagtail/wagtailadmin/views/account.py | 2 +- wagtail/wagtailadmin/views/chooser.py | 6 +- .../wagtailadmin/views/collection_privacy.py | 4 +- wagtail/wagtailadmin/views/collections.py | 6 +- wagtail/wagtailadmin/views/generic.py | 2 +- wagtail/wagtailadmin/views/home.py | 4 +- wagtail/wagtailadmin/views/page_privacy.py | 2 +- wagtail/wagtailadmin/views/pages.py | 4 +- wagtail/wagtailadmin/views/userbar.py | 4 +- wagtail/wagtailadmin/viewsets/__init__.py | 2 +- wagtail/wagtailadmin/viewsets/model.py | 2 +- wagtail/wagtailadmin/wagtail_hooks.py | 4 +- wagtail/wagtailadmin/widgets.py | 4 +- wagtail/wagtaildocs/blocks.py | 2 +- .../migrations/0005_document_collection.py | 4 +- wagtail/wagtaildocs/models.py | 2 +- wagtail/wagtaildocs/permissions.py | 2 +- wagtail/wagtaildocs/tests/test_admin_views.py | 2 +- .../tests/test_collection_privacy.py | 2 +- wagtail/wagtaildocs/tests/test_models.py | 2 +- wagtail/wagtaildocs/views/chooser.py | 4 +- wagtail/wagtaildocs/views/documents.py | 2 +- wagtail/wagtaildocs/views/serve.py | 6 +- wagtail/wagtaildocs/wagtail_hooks.py | 8 +-- wagtail/wagtailembeds/blocks.py | 2 +- wagtail/wagtailembeds/tests.py | 2 +- wagtail/wagtailembeds/wagtail_hooks.py | 2 +- wagtail/wagtailforms/models.py | 4 +- wagtail/wagtailforms/tests/test_forms.py | 2 +- wagtail/wagtailforms/tests/test_models.py | 2 +- wagtail/wagtailforms/tests/test_views.py | 2 +- wagtail/wagtailforms/tests/utils.py | 2 +- wagtail/wagtailforms/views.py | 2 +- wagtail/wagtailforms/wagtail_hooks.py | 2 +- wagtail/wagtailimages/blocks.py | 2 +- .../migrations/0011_image_collection.py | 4 +- wagtail/wagtailimages/models.py | 4 +- wagtail/wagtailimages/permissions.py | 2 +- .../wagtailimages/tests/test_admin_views.py | 2 +- .../tests/test_image_operations.py | 2 +- wagtail/wagtailimages/tests/test_jinja2.py | 2 +- wagtail/wagtailimages/tests/test_models.py | 2 +- .../tests/test_signal_handlers.py | 2 +- wagtail/wagtailimages/views/chooser.py | 4 +- wagtail/wagtailimages/views/images.py | 2 +- wagtail/wagtailimages/wagtail_hooks.py | 2 +- wagtail/wagtailredirects/forms.py | 2 +- wagtail/wagtailredirects/permissions.py | 2 +- wagtail/wagtailredirects/tests.py | 2 +- wagtail/wagtailredirects/wagtail_hooks.py | 2 +- .../tests/test_elasticsearch2_backend.py | 6 +- wagtail/wagtailsearch/tests/test_frontend.py | 2 +- .../tests/test_index_functions.py | 2 +- wagtail/wagtailsearch/views/frontend.py | 2 +- wagtail/wagtailsearch/wagtail_hooks.py | 2 +- wagtail/wagtailsites/forms.py | 2 +- wagtail/wagtailsites/tests.py | 2 +- wagtail/wagtailsites/views.py | 4 +- wagtail/wagtailsites/wagtail_hooks.py | 4 +- wagtail/wagtailsnippets/blocks.py | 4 +- wagtail/wagtailsnippets/tests.py | 2 +- wagtail/wagtailsnippets/wagtail_hooks.py | 2 +- wagtail/wagtailusers/forms.py | 4 +- .../templatetags/wagtailusers_tags.py | 2 +- wagtail/wagtailusers/tests.py | 6 +- wagtail/wagtailusers/utils.py | 2 +- wagtail/wagtailusers/views/groups.py | 2 +- wagtail/wagtailusers/views/users.py | 4 +- wagtail/wagtailusers/wagtail_hooks.py | 4 +- 367 files changed, 498 insertions(+), 498 deletions(-) rename wagtail/{wagtailcore => core}/__init__.py (82%) rename wagtail/{wagtailcore => core}/admin.py (91%) rename wagtail/{wagtailcore => core}/apps.py (68%) rename wagtail/{wagtailcore => core}/blocks/__init__.py (73%) rename wagtail/{wagtailcore => core}/blocks/base.py (99%) rename wagtail/{wagtailcore => core}/blocks/field_block.py (98%) rename wagtail/{wagtailcore => core}/blocks/list_block.py (98%) rename wagtail/{wagtailcore => core}/blocks/static_block.py (100%) rename wagtail/{wagtailcore => core}/blocks/stream_block.py (99%) rename wagtail/{wagtailcore => core}/blocks/struct_block.py (99%) rename wagtail/{wagtailcore => core}/blocks/utils.py (100%) rename wagtail/{wagtailcore => core}/compat.py (100%) rename wagtail/{wagtailcore => core}/fields.py (98%) rename wagtail/{wagtailcore => core}/forms.py (100%) rename wagtail/{wagtailcore => core}/hooks.py (100%) rename wagtail/{wagtailcore => core}/jinja2tags.py (100%) rename wagtail/{wagtailcore => core}/locale/ar/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/ar/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/bg/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/bg/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/ca/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/ca/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/cs/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/cs/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/de/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/de/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/el/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/el/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/en/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/en/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/es/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/es/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/fa/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/fa/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/fi/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/fi/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/fr/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/fr/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/gl/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/gl/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/he_IL/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/he_IL/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/hu/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/hu/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/id_ID/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/id_ID/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/is_IS/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/is_IS/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/it/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/it/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/ja/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/ja/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/ka/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/ka/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/ko/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/ko/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/lt/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/lt/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/lv/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/lv/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/nb/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/nb/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/nl/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/nl/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/nl_NL/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/nl_NL/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/pl/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/pl/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/pt_BR/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/pt_BR/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/pt_PT/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/pt_PT/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/ro/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/ro/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/ru/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/ru/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/sk_SK/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/sk_SK/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/sl/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/sl/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/sv/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/sv/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/tr/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/tr/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/uk/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/uk/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/zh/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/zh/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/locale/zh_CN/LC_MESSAGES/django.mo (100%) rename wagtail/{wagtailcore => core}/locale/zh_CN/LC_MESSAGES/django.po (100%) rename wagtail/{wagtailcore => core}/management/__init__.py (100%) rename wagtail/{wagtailcore => core}/management/commands/__init__.py (100%) rename wagtail/{wagtailcore => core}/management/commands/fixtree.py (99%) rename wagtail/{wagtailcore => core}/management/commands/move_pages.py (94%) rename wagtail/{wagtailcore => core}/management/commands/publish_scheduled_pages.py (98%) rename wagtail/{wagtailcore => core}/management/commands/replace_text.py (96%) rename wagtail/{wagtailcore => core}/management/commands/set_url_paths.py (92%) rename wagtail/{wagtailcore => core}/middleware.py (91%) rename wagtail/{wagtailcore => core}/migrations/0001_initial.py (100%) rename wagtail/{wagtailcore => core}/migrations/0001_squashed_0016_change_page_url_path_to_text_field.py (100%) rename wagtail/{wagtailcore => core}/migrations/0002_initial_data.py (100%) rename wagtail/{wagtailcore => core}/migrations/0003_add_uniqueness_constraint_on_group_page_permission.py (100%) rename wagtail/{wagtailcore => core}/migrations/0004_page_locked.py (100%) rename wagtail/{wagtailcore => core}/migrations/0005_add_page_lock_permission_to_moderators.py (100%) rename wagtail/{wagtailcore => core}/migrations/0006_add_lock_page_permission.py (100%) rename wagtail/{wagtailcore => core}/migrations/0007_page_latest_revision_created_at.py (100%) rename wagtail/{wagtailcore => core}/migrations/0008_populate_latest_revision_created_at.py (100%) rename wagtail/{wagtailcore => core}/migrations/0009_remove_auto_now_add_from_pagerevision_created_at.py (100%) rename wagtail/{wagtailcore => core}/migrations/0010_change_page_owner_to_null_on_delete.py (100%) rename wagtail/{wagtailcore => core}/migrations/0011_page_first_published_at.py (100%) rename wagtail/{wagtailcore => core}/migrations/0012_extend_page_slug_field.py (100%) rename wagtail/{wagtailcore => core}/migrations/0013_update_golive_expire_help_text.py (100%) rename wagtail/{wagtailcore => core}/migrations/0014_add_verbose_name.py (100%) rename wagtail/{wagtailcore => core}/migrations/0015_add_more_verbose_names.py (100%) rename wagtail/{wagtailcore => core}/migrations/0016_change_page_url_path_to_text_field.py (100%) rename wagtail/{wagtailcore => core}/migrations/0017_change_edit_page_permission_description.py (100%) rename wagtail/{wagtailcore => core}/migrations/0018_pagerevision_submitted_for_moderation_index.py (100%) rename wagtail/{wagtailcore => core}/migrations/0019_verbose_names_cleanup.py (100%) rename wagtail/{wagtailcore => core}/migrations/0020_add_index_on_page_first_published_at.py (100%) rename wagtail/{wagtailcore => core}/migrations/0021_capitalizeverbose.py (100%) rename wagtail/{wagtailcore => core}/migrations/0022_add_site_name.py (100%) rename wagtail/{wagtailcore => core}/migrations/0023_alter_page_revision_on_delete_behaviour.py (100%) rename wagtail/{wagtailcore => core}/migrations/0024_alter_page_content_type_on_delete_behaviour.py (74%) rename wagtail/{wagtailcore => core}/migrations/0024_collection.py (100%) rename wagtail/{wagtailcore => core}/migrations/0025_collection_initial_data.py (100%) rename wagtail/{wagtailcore => core}/migrations/0026_group_collection_permission.py (100%) rename wagtail/{wagtailcore => core}/migrations/0027_fix_collection_path_collation.py (100%) rename wagtail/{wagtailcore => core}/migrations/0028_merge.py (100%) rename wagtail/{wagtailcore => core}/migrations/0029_unicode_slugfield_dj19.py (100%) rename wagtail/{wagtailcore => core}/migrations/0030_index_on_pagerevision_created_at.py (100%) rename wagtail/{wagtailcore => core}/migrations/0031_add_page_view_restriction_types.py (100%) rename wagtail/{wagtailcore => core}/migrations/0032_add_bulk_delete_page_permission.py (100%) rename wagtail/{wagtailcore => core}/migrations/0033_remove_golive_expiry_help_text.py (100%) rename wagtail/{wagtailcore => core}/migrations/0034_page_live_revision.py (100%) rename wagtail/{wagtailcore => core}/migrations/0035_page_last_published_at.py (100%) rename wagtail/{wagtailcore => core}/migrations/0036_populate_page_last_published_at.py (100%) rename wagtail/{wagtailcore => core}/migrations/0037_set_page_owner_editable.py (100%) rename wagtail/{wagtailcore => core}/migrations/0038_make_first_published_at_editable.py (100%) rename wagtail/{wagtailcore => core}/migrations/0039_collectionviewrestriction.py (100%) rename wagtail/{wagtailcore => core}/migrations/0040_page_draft_title.py (100%) rename wagtail/{wagtailcore => core}/migrations/__init__.py (100%) rename wagtail/{wagtailcore => core}/models.py (99%) rename wagtail/{wagtailcore => core}/permission_policies/__init__.py (100%) rename wagtail/{wagtailcore => core}/permission_policies/base.py (100%) rename wagtail/{wagtailcore => core}/permission_policies/collections.py (99%) rename wagtail/{wagtailcore => core}/permissions.py (57%) rename wagtail/{wagtailcore => core}/query.py (99%) rename wagtail/{wagtailcore => core}/rich_text.py (98%) rename wagtail/{wagtailcore => core}/signal_handlers.py (96%) rename wagtail/{wagtailcore => core}/signals.py (100%) rename wagtail/{wagtailcore => core}/sites.py (100%) rename wagtail/{wagtailcore => core}/templates/wagtailcore/login.html (100%) rename wagtail/{wagtailcore => core}/templates/wagtailcore/page.html (100%) rename wagtail/{wagtailcore => core}/templates/wagtailcore/password_required.html (100%) rename wagtail/{wagtailcore => core}/templatetags/__init__.py (100%) rename wagtail/{wagtailcore => core}/templatetags/wagtailcore_tags.py (97%) rename wagtail/{wagtailcore => core}/tests/__init__.py (100%) rename wagtail/{wagtailcore => core}/tests/test_blocks.py (99%) rename wagtail/{wagtailcore => core}/tests/test_collection_model.py (98%) rename wagtail/{wagtailcore => core}/tests/test_collection_permission_policies.py (99%) rename wagtail/{wagtailcore => core}/tests/test_dbwhitelister.py (97%) rename wagtail/{wagtailcore => core}/tests/test_hooks.py (96%) rename wagtail/{wagtailcore => core}/tests/test_jinja2.py (98%) rename wagtail/{wagtailcore => core}/tests/test_management_commands.py (98%) rename wagtail/{wagtailcore => core}/tests/test_migrations.py (100%) rename wagtail/{wagtailcore => core}/tests/test_page_model.py (99%) rename wagtail/{wagtailcore => core}/tests/test_page_permissions.py (99%) rename wagtail/{wagtailcore => core}/tests/test_page_privacy.py (98%) rename wagtail/{wagtailcore => core}/tests/test_page_queryset.py (99%) rename wagtail/{wagtailcore => core}/tests/test_permission_policies.py (99%) rename wagtail/{wagtailcore => core}/tests/test_rich_text.py (98%) rename wagtail/{wagtailcore => core}/tests/test_sites.py (99%) rename wagtail/{wagtailcore => core}/tests/test_streamfield.py (97%) rename wagtail/{wagtailcore => core}/tests/test_tests.py (98%) rename wagtail/{wagtailcore => core}/tests/test_utils.py (96%) rename wagtail/{wagtailcore => core}/tests/test_views.py (97%) rename wagtail/{wagtailcore => core}/tests/test_whitelist.py (99%) rename wagtail/{wagtailcore => core}/tests/tests.py (97%) rename wagtail/{wagtailcore => core}/url_routing.py (100%) rename wagtail/{wagtailcore => core}/urls.py (92%) rename wagtail/{wagtailcore => core}/utils.py (100%) rename wagtail/{wagtailcore => core}/views.py (87%) rename wagtail/{wagtailcore => core}/wagtail_hooks.py (89%) rename wagtail/{wagtailcore => core}/whitelist.py (100%) diff --git a/.tx/config b/.tx/config index 3a1e1960e..04256189d 100644 --- a/.tx/config +++ b/.tx/config @@ -8,8 +8,8 @@ source_lang = en type = PO [wagtail.wagtailcore] -file_filter = wagtail/wagtailcore/locale//LC_MESSAGES/django.po -source_file = wagtail/wagtailcore/locale/en/LC_MESSAGES/django.po +file_filter = wagtail/core/locale//LC_MESSAGES/django.po +source_file = wagtail/core/locale/en/LC_MESSAGES/django.po source_lang = en type = PO diff --git a/docs/advanced_topics/customisation/admin_templates.rst b/docs/advanced_topics/customisation/admin_templates.rst index 050210104..253f9e7e2 100644 --- a/docs/advanced_topics/customisation/admin_templates.rst +++ b/docs/advanced_topics/customisation/admin_templates.rst @@ -13,7 +13,7 @@ You need to create a ``templates/wagtailadmin/`` folder within one of your apps 'dashboard', - 'wagtail.wagtailcore', + 'wagtail.core', 'wagtail.wagtailadmin', # ... diff --git a/docs/advanced_topics/customisation/page_editing_interface.rst b/docs/advanced_topics/customisation/page_editing_interface.rst index 9c9fafb0f..92dea5621 100644 --- a/docs/advanced_topics/customisation/page_editing_interface.rst +++ b/docs/advanced_topics/customisation/page_editing_interface.rst @@ -38,11 +38,11 @@ As standard, Wagtail organises panels for pages into three tabs: 'Content', 'Pro Rich Text (HTML) ~~~~~~~~~~~~~~~~ -Wagtail provides a general-purpose WYSIWYG editor for creating rich text content (HTML) and embedding media such as images, video, and documents. To include this in your models, use the :class:`~wagtail.wagtailcore.fields.RichTextField` function when defining a model field: +Wagtail provides a general-purpose WYSIWYG editor for creating rich text content (HTML) and embedding media such as images, video, and documents. To include this in your models, use the :class:`~wagtail.core.fields.RichTextField` function when defining a model field: .. code-block:: python - from wagtail.wagtailcore.fields import RichTextField + from wagtail.core.fields import RichTextField from wagtail.wagtailadmin.edit_handlers import FieldPanel @@ -53,9 +53,9 @@ Wagtail provides a general-purpose WYSIWYG editor for creating rich text content FieldPanel('body', classname="full"), ] -:class:`~wagtail.wagtailcore.fields.RichTextField` inherits from Django's basic ``TextField`` field, so you can pass any field parameters into :class:`~wagtail.wagtailcore.fields.RichTextField` as if using a normal Django field. This field does not need a special panel and can be defined with ``FieldPanel``. +:class:`~wagtail.core.fields.RichTextField` inherits from Django's basic ``TextField`` field, so you can pass any field parameters into :class:`~wagtail.core.fields.RichTextField` as if using a normal Django field. This field does not need a special panel and can be defined with ``FieldPanel``. -However, template output from :class:`~wagtail.wagtailcore.fields.RichTextField` is special and need to be filtered to preserve embedded content. See :ref:`rich-text-filter`. +However, template output from :class:`~wagtail.core.fields.RichTextField` is special and need to be filtered to preserve embedded content. See :ref:`rich-text-filter`. .. _rich_text_features: @@ -97,7 +97,7 @@ Once the plugin has been created, it should be registered as a rich text feature .. code-block:: python from wagtail.wagtailadmin.rich_text import HalloPlugin - from wagtail.wagtailcore import hooks + from wagtail.core import hooks @hooks.register('register_rich_text_features') def register_embed_feature(features): @@ -141,7 +141,7 @@ To have a feature active by default (i.e. on ``RichTextFields`` that do not defi Image Formats in the Rich Text Editor ------------------------------------- -On loading, Wagtail will search for any app with the file ``image_formats.py`` and execute the contents. This provides a way to customise the formatting options shown to the editor when inserting images in the :class:`~wagtail.wagtailcore.fields.RichTextField` editor. +On loading, Wagtail will search for any app with the file ``image_formats.py`` and execute the contents. This provides a way to customise the formatting options shown to the editor when inserting images in the :class:`~wagtail.core.fields.RichTextField` editor. As an example, add a "thumbnail" format: @@ -159,7 +159,7 @@ To begin, import the ``Format`` class, ``register_image_format`` function, and o The unique key used to identify the format. To unregister this format, call ``unregister_image_format`` with this string as the only argument. ``label`` - The label used in the chooser form when inserting the image into the :class:`~wagtail.wagtailcore.fields.RichTextField`. + The label used in the chooser form when inserting the image into the :class:`~wagtail.core.fields.RichTextField`. ``classnames`` The string to assign to the ``class`` attribute of the generated ```` tag. @@ -197,7 +197,7 @@ or to add custom validation logic for your models: import geocoder # not in Wagtail, for example only - http://geocoder.readthedocs.io/ from wagtail.wagtailadmin.edit_handlers import FieldPanel from wagtail.wagtailadmin.forms import WagtailAdminPageForm - from wagtail.wagtailcore.models import Page + from wagtail.core.models import Page class EventPageForm(WagtailAdminPageForm): diff --git a/docs/advanced_topics/i18n/duplicate_tree.rst b/docs/advanced_topics/i18n/duplicate_tree.rst index d1215dc13..7d6ba0732 100644 --- a/docs/advanced_topics/i18n/duplicate_tree.rst +++ b/docs/advanced_topics/i18n/duplicate_tree.rst @@ -35,7 +35,7 @@ We must set Django's ``LANGUAGES`` setting so we don't redirect non English/Fren from django.utils import translation from django.http import HttpResponseRedirect - from wagtail.wagtailcore.models import Page + from wagtail.core.models import Page class LanguageRedirectionPage(Page): @@ -58,7 +58,7 @@ Here's an example of how this could be implemented (with English as the main lan .. code-block:: python - from wagtail.wagtailcore.models import Page + from wagtail.core.models import Page from wagtail.wagtailadmin.edit_handlers import MultiFieldPanel, PageChooserPanel diff --git a/docs/advanced_topics/i18n/index.rst b/docs/advanced_topics/i18n/index.rst index 36637de62..bdff5c1e2 100644 --- a/docs/advanced_topics/i18n/index.rst +++ b/docs/advanced_topics/i18n/index.rst @@ -89,7 +89,7 @@ This feature is enabled through the project's root URL configuration. Just put t from wagtail.wagtailadmin import urls as wagtailadmin_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls - from wagtail.wagtailcore import urls as wagtail_urls + from wagtail.core import urls as wagtail_urls urlpatterns = [ diff --git a/docs/advanced_topics/jinja2.rst b/docs/advanced_topics/jinja2.rst index bca2e9d05..00e5139de 100644 --- a/docs/advanced_topics/jinja2.rst +++ b/docs/advanced_topics/jinja2.rst @@ -24,7 +24,7 @@ Django needs to be configured to support Jinja2 templates. As the Wagtail admin 'APP_DIRS': True, 'OPTIONS': { 'extensions': [ - 'wagtail.wagtailcore.jinja2tags.core', + 'wagtail.core.jinja2tags.core', 'wagtail.wagtailadmin.jinja2tags.userbar', 'wagtail.wagtailimages.jinja2tags.images', ], diff --git a/docs/advanced_topics/settings.rst b/docs/advanced_topics/settings.rst index 967753974..343606a59 100644 --- a/docs/advanced_topics/settings.rst +++ b/docs/advanced_topics/settings.rst @@ -37,7 +37,7 @@ Middleware (``settings.py``) 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware', - 'wagtail.wagtailcore.middleware.SiteMiddleware', + 'wagtail.core.middleware.SiteMiddleware', 'wagtail.wagtailredirects.middleware.RedirectMiddleware', ] @@ -70,7 +70,7 @@ Apps (``settings.py``) 'wagtail.wagtailimages', 'wagtail.wagtailsearch', 'wagtail.wagtailadmin', - 'wagtail.wagtailcore', + 'wagtail.core', 'taggit', 'modelcluster', @@ -447,7 +447,7 @@ URL Patterns from django.contrib import admin - from wagtail.wagtailcore import urls as wagtail_urls + from wagtail.core import urls as wagtail_urls from wagtail.wagtailadmin import urls as wagtailadmin_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls from wagtail.wagtailsearch import urls as wagtailsearch_urls @@ -512,7 +512,7 @@ These two files should reside in your project directory (``myproject/myproject/` 'wagtail.wagtailimages', 'wagtail.wagtailsearch', 'wagtail.wagtailadmin', - 'wagtail.wagtailcore', + 'wagtail.core', 'taggit', 'modelcluster', @@ -534,7 +534,7 @@ These two files should reside in your project directory (``myproject/myproject/` 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware', - 'wagtail.wagtailcore.middleware.SiteMiddleware', + 'wagtail.core.middleware.SiteMiddleware', 'wagtail.wagtailredirects.middleware.RedirectMiddleware', ] @@ -690,7 +690,7 @@ These two files should reside in your project directory (``myproject/myproject/` from django.conf import settings import os.path - from wagtail.wagtailcore import urls as wagtail_urls + from wagtail.core import urls as wagtail_urls from wagtail.wagtailadmin import urls as wagtailadmin_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls from wagtail.wagtailsearch import urls as wagtailsearch_urls diff --git a/docs/contributing/developing.rst b/docs/contributing/developing.rst index 0eddecb23..4cb9d7c4c 100644 --- a/docs/contributing/developing.rst +++ b/docs/contributing/developing.rst @@ -72,14 +72,14 @@ an argument to ``runtests.py``: .. code-block:: console - $ python runtests.py wagtail.wagtailcore + $ python runtests.py wagtail.core You can also run tests for individual TestCases by passing in the path as an argument to ``runtests.py`` .. code-block:: console - $ python runtests.py wagtail.wagtailcore.tests.test_blocks.TestIntegerBlock + $ python runtests.py wagtail.core.tests.test_blocks.TestIntegerBlock **Running migrations for the test app models** diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst index 436fb3a66..c854f9c3d 100644 --- a/docs/getting_started/integrating_into_django.rst +++ b/docs/getting_started/integrating_into_django.rst @@ -30,7 +30,7 @@ In your settings file, add the following apps to ``INSTALLED_APPS``: 'wagtail.wagtailimages', 'wagtail.wagtailsearch', 'wagtail.wagtailadmin', - 'wagtail.wagtailcore', + 'wagtail.core', 'modelcluster', 'taggit', @@ -39,7 +39,7 @@ Add the following entries to ``MIDDLEWARE``: .. code-block:: python - 'wagtail.wagtailcore.middleware.SiteMiddleware', + 'wagtail.core.middleware.SiteMiddleware', 'wagtail.wagtailredirects.middleware.RedirectMiddleware', Add a ``STATIC_ROOT`` setting, if your project does not have one already: @@ -65,7 +65,7 @@ Now make the following additions to your ``urls.py`` file: from wagtail.wagtailadmin import urls as wagtailadmin_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls - from wagtail.wagtailcore import urls as wagtail_urls + from wagtail.core import urls as wagtail_urls urlpatterns = [ ... diff --git a/docs/getting_started/tutorial.rst b/docs/getting_started/tutorial.rst index 6a04d9bf1..1d7263b8a 100644 --- a/docs/getting_started/tutorial.rst +++ b/docs/getting_started/tutorial.rst @@ -71,8 +71,8 @@ Edit ``home/models.py`` as follows, to add a ``body`` field to the model: from django.db import models - from wagtail.wagtailcore.models import Page - from wagtail.wagtailcore.fields import RichTextField + from wagtail.core.models import Page + from wagtail.core.fields import RichTextField from wagtail.wagtailadmin.edit_handlers import FieldPanel @@ -164,8 +164,8 @@ Lets start with a simple index page for our blog. In ``blog/models.py``: .. code-block:: python - from wagtail.wagtailcore.models import Page - from wagtail.wagtailcore.fields import RichTextField + from wagtail.core.models import Page + from wagtail.core.fields import RichTextField from wagtail.wagtailadmin.edit_handlers import FieldPanel @@ -218,8 +218,8 @@ Now we need a model and template for our blog posts. In ``blog/models.py``: from django.db import models - from wagtail.wagtailcore.models import Page - from wagtail.wagtailcore.fields import RichTextField + from wagtail.core.models import Page + from wagtail.core.fields import RichTextField from wagtail.wagtailadmin.edit_handlers import FieldPanel from wagtail.wagtailsearch import index @@ -409,8 +409,8 @@ Add a new ``BlogPageGalleryImage`` model to ``models.py``: from modelcluster.fields import ParentalKey - from wagtail.wagtailcore.models import Page, Orderable - from wagtail.wagtailcore.fields import RichTextField + from wagtail.core.models import Page, Orderable + from wagtail.core.fields import RichTextField from wagtail.wagtailadmin.edit_handlers import FieldPanel, InlinePanel from wagtail.wagtailimages.edit_handlers import ImageChooserPanel from wagtail.wagtailsearch import index @@ -572,8 +572,8 @@ First, alter ``models.py`` once more: from modelcluster.contrib.taggit import ClusterTaggableManager from taggit.models import TaggedItemBase - from wagtail.wagtailcore.models import Page, Orderable - from wagtail.wagtailcore.fields import RichTextField + from wagtail.core.models import Page, Orderable + from wagtail.core.fields import RichTextField from wagtail.wagtailadmin.edit_handlers import FieldPanel, InlinePanel, MultiFieldPanel from wagtail.wagtailimages.edit_handlers import ImageChooserPanel from wagtail.wagtailsearch import index diff --git a/docs/reference/contrib/forms/customisation.rst b/docs/reference/contrib/forms/customisation.rst index 3f0f8e5d3..c3c27f35d 100644 --- a/docs/reference/contrib/forms/customisation.rst +++ b/docs/reference/contrib/forms/customisation.rst @@ -18,7 +18,7 @@ You can do this as shown below. FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel ) - from wagtail.wagtailcore.fields import RichTextField + from wagtail.core.fields import RichTextField from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField @@ -69,7 +69,7 @@ Example: FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel ) - from wagtail.wagtailcore.fields import RichTextField + from wagtail.core.fields import RichTextField from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField, AbstractFormSubmission @@ -130,7 +130,7 @@ The following example shows how to add a username to the CSV export: FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel ) - from wagtail.wagtailcore.fields import RichTextField + from wagtail.core.fields import RichTextField from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField, AbstractFormSubmission @@ -208,7 +208,7 @@ Example: FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel ) - from wagtail.wagtailcore.fields import RichTextField + from wagtail.core.fields import RichTextField from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField, AbstractFormSubmission @@ -304,7 +304,7 @@ The following example shows how to create a multi-step form. FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel ) - from wagtail.wagtailcore.fields import RichTextField + from wagtail.core.fields import RichTextField from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField @@ -455,7 +455,7 @@ First, you need to collect results as shown below: FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel ) - from wagtail.wagtailcore.fields import RichTextField + from wagtail.core.fields import RichTextField from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField diff --git a/docs/reference/contrib/forms/index.rst b/docs/reference/contrib/forms/index.rst index 93cd2b173..7dd91288f 100644 --- a/docs/reference/contrib/forms/index.rst +++ b/docs/reference/contrib/forms/index.rst @@ -33,7 +33,7 @@ Within the ``models.py`` of one of your apps, create a model that extends ``wagt FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel ) - from wagtail.wagtailcore.fields import RichTextField + from wagtail.core.fields import RichTextField from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField diff --git a/docs/reference/contrib/frontendcache.rst b/docs/reference/contrib/frontendcache.rst index 007422c3f..348aedeb7 100644 --- a/docs/reference/contrib/frontendcache.rst +++ b/docs/reference/contrib/frontendcache.rst @@ -164,7 +164,7 @@ This signal handler would trigger the invalidation of the index page using the from django.dispatch import receiver from django.db.models.signals import pre_delete - from wagtail.wagtailcore.signals import page_published + from wagtail.core.signals import page_published from wagtail.contrib.wagtailfrontendcache.utils import PurgeBatch ... diff --git a/docs/reference/contrib/routablepage.rst b/docs/reference/contrib/routablepage.rst index 20632908e..049c52bc1 100644 --- a/docs/reference/contrib/routablepage.rst +++ b/docs/reference/contrib/routablepage.rst @@ -30,13 +30,13 @@ Add ``"wagtail.contrib.wagtailroutablepage"`` to your INSTALLED_APPS: The basics ========== -To use ``RoutablePageMixin``, you need to make your class inherit from both :class:`wagtail.contrib.wagtailroutablepage.models.RoutablePageMixin` and :class:`wagtail.wagtailcore.models.Page`, then define some view methods and decorate them with ``wagtail.contrib.wagtailroutablepage.models.route``. +To use ``RoutablePageMixin``, you need to make your class inherit from both :class:`wagtail.contrib.wagtailroutablepage.models.RoutablePageMixin` and :class:`wagtail.core.models.Page`, then define some view methods and decorate them with ``wagtail.contrib.wagtailroutablepage.models.route``. Here's an example of an ``EventPage`` with three views: .. code-block:: python - from wagtail.wagtailcore.models import Page + from wagtail.core.models import Page from wagtail.contrib.wagtailroutablepage.models import RoutablePageMixin, route @@ -77,7 +77,7 @@ Reversing URLs >>> event_page.reverse_subpage('events_for_year', args=(2015, )) 'year/2015/' -This method only returns the part of the URL within the page. To get the full URL, you must append it to the values of either the :attr:`~wagtail.wagtailcore.models.Page.url` or the :attr:`~wagtail.wagtailcore.models.Page.full_url` attribute on your page: +This method only returns the part of the URL within the page. To get the full URL, you must append it to the values of either the :attr:`~wagtail.core.models.Page.url` or the :attr:`~wagtail.core.models.Page.full_url` attribute on your page: .. code-block:: python @@ -94,7 +94,7 @@ The route name defaults to the name of the view. You can override this name with .. code-block:: python - from wagtail.wagtailcore.models import Page + from wagtail.core.models import Page from wagtail.contrib.wagtailroutablepage.models import RoutablePageMixin, route diff --git a/docs/reference/hooks.rst b/docs/reference/hooks.rst index fc05bf576..d90503378 100644 --- a/docs/reference/hooks.rst +++ b/docs/reference/hooks.rst @@ -10,7 +10,7 @@ Registering functions with a Wagtail hook is done through the ``@hooks.register` .. code-block:: python - from wagtail.wagtailcore import hooks + from wagtail.core import hooks @hooks.register('name_of_hook') def my_hook_function(arg1, arg2...) @@ -62,7 +62,7 @@ Hooks for building new areas of the admin interface (alongside pages, images, do from django.utils.safestring import mark_safe - from wagtail.wagtailcore import hooks + from wagtail.core import hooks class WelcomePanel(object): order = 50 @@ -96,7 +96,7 @@ Hooks for building new areas of the admin interface (alongside pages, images, do .. code-block:: python - from wagtail.wagtailcore import hooks + from wagtail.core import hooks @hooks.register('construct_main_menu') def hide_explorer_menu_item_from_frank(request, menu_items): @@ -139,7 +139,7 @@ Hooks for building new areas of the admin interface (alongside pages, images, do from django.urls import reverse - from wagtail.wagtailcore import hooks + from wagtail.core import hooks from wagtail.wagtailadmin.menu import MenuItem @hooks.register('register_admin_menu_item') @@ -161,7 +161,7 @@ Hooks for building new areas of the admin interface (alongside pages, images, do from django.http import HttpResponse from django.conf.urls import url - from wagtail.wagtailcore import hooks + from wagtail.core import hooks def admin_view(request): return HttpResponse( @@ -215,7 +215,7 @@ Hooks for building new areas of the admin interface (alongside pages, images, do .. code-block:: python from django.urls import reverse - from wagtail.wagtailcore import hooks + from wagtail.core import hooks from wagtail.wagtailadmin.search import SearchArea @hooks.register('register_admin_search_area') @@ -248,7 +248,7 @@ Hooks for building new areas of the admin interface (alongside pages, images, do .. code-block:: python - from wagtail.wagtailcore import hooks + from wagtail.core import hooks @hooks.register('filter_form_submissions_for_user') @@ -273,14 +273,14 @@ Hooks for customising the editing interface for pages and snippets. Customise the rules that define which HTML elements are allowed in rich text areas. By default only a limited set of HTML elements and attributes are whitelisted - all others are stripped out. The callables passed into this hook must return a dict, which maps element names to handler functions that will perform some kind of manipulation of the element. These handler functions receive the element as a `BeautifulSoup `_ Tag object. - The ``wagtail.wagtailcore.whitelist`` module provides a few helper functions to assist in defining these handlers: ``allow_without_attributes``, a handler which preserves the element but strips out all of its attributes, and ``attribute_rule`` which accepts a dict specifying how to handle each attribute, and returns a handler function. This dict will map attribute names to either True (indicating that the attribute should be kept), False (indicating that it should be dropped), or a callable (which takes the initial attribute value and returns either a final value for the attribute, or None to drop the attribute). + The ``wagtail.core.whitelist`` module provides a few helper functions to assist in defining these handlers: ``allow_without_attributes``, a handler which preserves the element but strips out all of its attributes, and ``attribute_rule`` which accepts a dict specifying how to handle each attribute, and returns a handler function. This dict will map attribute names to either True (indicating that the attribute should be kept), False (indicating that it should be dropped), or a callable (which takes the initial attribute value and returns either a final value for the attribute, or None to drop the attribute). For example, the following hook function will add the ``
`` element to the whitelist, and allow the ``target`` attribute on ```` elements: .. code-block:: python - from wagtail.wagtailcore import hooks - from wagtail.wagtailcore.whitelist import attribute_rule, check_url, allow_without_attributes + from wagtail.core import hooks + from wagtail.core.whitelist import attribute_rule, check_url, allow_without_attributes @hooks.register('construct_whitelister_element_rules') def whitelister_element_rules(): @@ -302,7 +302,7 @@ Hooks for customising the editing interface for pages and snippets. from django.contrib.staticfiles.templatetags.staticfiles import static from django.utils.html import format_html - from wagtail.wagtailcore import hooks + from wagtail.core import hooks @hooks.register('insert_editor_css') def editor_css(): @@ -324,7 +324,7 @@ Hooks for customising the editing interface for pages and snippets. from django.utils.html import format_html from django.contrib.staticfiles.templatetags.staticfiles import static - from wagtail.wagtailcore import hooks + from wagtail.core import hooks @hooks.register('insert_global_admin_css') def global_admin_css(): @@ -343,7 +343,7 @@ Hooks for customising the editing interface for pages and snippets. from django.utils.html import format_html, format_html_join from django.conf import settings - from wagtail.wagtailcore import hooks + from wagtail.core import hooks @hooks.register('insert_editor_js') def editor_js(): @@ -375,7 +375,7 @@ Hooks for customising the editing interface for pages and snippets. from django.utils.html import format_html - from wagtail.wagtailcore import hooks + from wagtail.core import hooks @hooks.register('insert_global_admin_js') def global_admin_js(): @@ -401,7 +401,7 @@ Hooks for customising the way users are directed through the process of creating from django.http import HttpResponse - from wagtail.wagtailcore import hooks + from wagtail.core import hooks @hooks.register('after_create_page') def do_after_page_create(request, page): @@ -423,7 +423,7 @@ Hooks for customising the way users are directed through the process of creating .. code-block:: python - from wagtail.wagtailcore import hooks + from wagtail.core import hooks from .models import AwesomePage from .admin_views import edit_awesome_page @@ -501,7 +501,7 @@ Hooks for customising the way users are directed through the process of creating .. code-block:: python - from wagtail.wagtailcore import hooks + from wagtail.core import hooks class UserbarPuppyLinkItem(object): def render(self, request): @@ -529,7 +529,7 @@ Hooks for customising the way admins are directed through the process of editing from django.http import HttpResponse - from wagtail.wagtailcore import hooks + from wagtail.core import hooks @hooks.register('after_create_user') def do_after_page_create(request, user): @@ -551,7 +551,7 @@ Hooks for customising the way admins are directed through the process of editing .. code-block:: python - from wagtail.wagtailcore import hooks + from wagtail.core import hooks from .models import AwesomePage from .admin_views import edit_awesome_page @@ -609,7 +609,7 @@ Choosers .. code-block:: python - from wagtail.wagtailcore import hooks + from wagtail.core import hooks @hooks.register('construct_page_chooser_queryset') def show_my_pages_only(pages, request): @@ -628,7 +628,7 @@ Choosers .. code-block:: python - from wagtail.wagtailcore import hooks + from wagtail.core import hooks @hooks.register('construct_document_chooser_queryset') def show_my_uploaded_documents_only(documents, request): @@ -647,7 +647,7 @@ Choosers .. code-block:: python - from wagtail.wagtailcore import hooks + from wagtail.core import hooks @hooks.register('construct_image_chooser_queryset') def show_my_uploaded_images_only(images, request): @@ -669,7 +669,7 @@ Page explorer .. code-block:: python - from wagtail.wagtailcore import hooks + from wagtail.core import hooks @hooks.register('construct_explorer_page_queryset') def show_my_profile_only(parent_page, pages, request): @@ -777,7 +777,7 @@ Page serving .. code-block:: python - from wagtail.wagtailcore import hooks + from wagtail.core import hooks @hooks.register('before_serve_page') def block_googlebot(page, request, serve_args, serve_kwargs): diff --git a/docs/reference/pages/index.rst b/docs/reference/pages/index.rst index 6a32d8b05..557af77f6 100644 --- a/docs/reference/pages/index.rst +++ b/docs/reference/pages/index.rst @@ -1,7 +1,7 @@ Pages ===== -Wagtail requires a little careful setup to define the types of content that you want to present through your website. The basic unit of content in Wagtail is the :class:`~wagtail.wagtailcore.models.Page`, and all of your page-level content will inherit basic webpage-related properties from it. But for the most part, you will be defining content yourself, through the construction of Django models using Wagtail's ``Page`` as a base. +Wagtail requires a little careful setup to define the types of content that you want to present through your website. The basic unit of content in Wagtail is the :class:`~wagtail.core.models.Page`, and all of your page-level content will inherit basic webpage-related properties from it. But for the most part, you will be defining content yourself, through the construction of Django models using Wagtail's ``Page`` as a base. Wagtail organizes content created from your models in a tree, which can have any structure and combination of model objects in it. Wagtail doesn't prescribe ways to organize and interrelate your content, but here we've sketched out some strategies for organizing your models. diff --git a/docs/reference/pages/model_recipes.rst b/docs/reference/pages/model_recipes.rst index 3fe0768a8..eeca20670 100644 --- a/docs/reference/pages/model_recipes.rst +++ b/docs/reference/pages/model_recipes.rst @@ -4,10 +4,10 @@ Recipes ======= -Overriding the :meth:`~wagtail.wagtailcore.models.Page.serve` Method +Overriding the :meth:`~wagtail.core.models.Page.serve` Method -------------------------------------------------------------------- -Wagtail defaults to serving :class:`~wagtail.wagtailcore.models.Page`-derived models by passing a reference to the page object to a Django HTML template matching the model's name, but suppose you wanted to serve something other than HTML? You can override the :meth:`~wagtail.wagtailcore.models.Page.serve` method provided by the :class:`~wagtail.wagtailcore.models.Page` class and handle the Django request and response more directly. +Wagtail defaults to serving :class:`~wagtail.core.models.Page`-derived models by passing a reference to the page object to a Django HTML template matching the model's name, but suppose you wanted to serve something other than HTML? You can override the :meth:`~wagtail.core.models.Page.serve` method provided by the :class:`~wagtail.core.models.Page` class and handle the Django request and response more directly. Consider this example from the Wagtail demo site's ``models.py``, which serves an ``EventPage`` object as an iCal file if the ``format`` variable is set in the request: @@ -34,14 +34,14 @@ Consider this example from the Wagtail demo site's ``models.py``, which serves a # Display event page as usual return super(EventPage, self).serve(request) -:meth:`~wagtail.wagtailcore.models.Page.serve` takes a Django request object and returns a Django response object. Wagtail returns a ``TemplateResponse`` object with the template and context which it generates, which allows middleware to function as intended, so keep in mind that a simpler response object like a ``HttpResponse`` will not receive these benefits. +:meth:`~wagtail.core.models.Page.serve` takes a Django request object and returns a Django response object. Wagtail returns a ``TemplateResponse`` object with the template and context which it generates, which allows middleware to function as intended, so keep in mind that a simpler response object like a ``HttpResponse`` will not receive these benefits. With this strategy, you could use Django or Python utilities to render your model in JSON or XML or any other format you'd like. .. _overriding_route_method: -Adding Endpoints with Custom :meth:`~wagtail.wagtailcore.models.Page.route` Methods +Adding Endpoints with Custom :meth:`~wagtail.core.models.Page.route` Methods ----------------------------------------------------------------------------------- .. note:: @@ -80,20 +80,20 @@ Wagtail routes requests by iterating over the path components (separated with a # the page matches the request, but isn't published, so 404 raise Http404 -:meth:`~wagtail.wagtailcore.models.Page.route` takes the current object (``self``), the ``request`` object, and a list of the remaining ``path_components`` from the request URL. It either continues delegating routing by calling :meth:`~wagtail.wagtailcore.models.Page.route` again on one of its children in the Wagtail tree, or ends the routing process by returning a ``RouteResult`` object or raising a 404 error. +:meth:`~wagtail.core.models.Page.route` takes the current object (``self``), the ``request`` object, and a list of the remaining ``path_components`` from the request URL. It either continues delegating routing by calling :meth:`~wagtail.core.models.Page.route` again on one of its children in the Wagtail tree, or ends the routing process by returning a ``RouteResult`` object or raising a 404 error. -The ``RouteResult`` object (defined in wagtail.wagtailcore.url_routing) encapsulates all the information Wagtail needs to call a page's :meth:`~wagtail.wagtailcore.models.Page.serve` method and return a final response: this information consists of the page object, and any additional ``args``/``kwargs`` to be passed to :meth:`~wagtail.wagtailcore.models.Page.serve`. +The ``RouteResult`` object (defined in wagtail.core.url_routing) encapsulates all the information Wagtail needs to call a page's :meth:`~wagtail.core.models.Page.serve` method and return a final response: this information consists of the page object, and any additional ``args``/``kwargs`` to be passed to :meth:`~wagtail.core.models.Page.serve`. -By overriding the :meth:`~wagtail.wagtailcore.models.Page.route` method, we could create custom endpoints for each object in the Wagtail tree. One use case might be using an alternate template when encountering the ``print/`` endpoint in the path. Another might be a REST API which interacts with the current object. Just to see what's involved, lets make a simple model which prints out all of its child path components. +By overriding the :meth:`~wagtail.core.models.Page.route` method, we could create custom endpoints for each object in the Wagtail tree. One use case might be using an alternate template when encountering the ``print/`` endpoint in the path. Another might be a REST API which interacts with the current object. Just to see what's involved, lets make a simple model which prints out all of its child path components. First, ``models.py``: .. code-block:: python from django.shortcuts import render - from wagtail.wagtailcore.url_routing import RouteResult + from wagtail.core.url_routing import RouteResult from django.http.response import Http404 - from wagtail.wagtailcore.models import Page + from wagtail.core.models import Page ... diff --git a/docs/reference/pages/model_reference.rst b/docs/reference/pages/model_reference.rst index abbf3d8a7..da7afc2d1 100644 --- a/docs/reference/pages/model_reference.rst +++ b/docs/reference/pages/model_reference.rst @@ -2,7 +2,7 @@ Model Reference =============== -.. automodule:: wagtail.wagtailcore.models +.. automodule:: wagtail.core.models This document contains reference information for the model classes inside the ``wagtailcore`` module. @@ -94,7 +94,7 @@ Database fields Defaults to ``False`` and can be overridden on the model with ``show_in_menus_default = True``. - This is used by the :meth:`~wagtail.wagtailcore.query.PageQuerySet.in_menu` QuerySet filter. + This is used by the :meth:`~wagtail.core.query.PageQuerySet.in_menu` QuerySet filter. Methods and properties ~~~~~~~~~~~~~~~~~~~~~~ @@ -220,7 +220,7 @@ In addition to the model fields provided, ``Page`` has many properties and metho The ``Site`` model is useful for multi-site installations as it allows an administrator to configure which part of the tree to use for each hostname that the server responds on. -This configuration is used by the :class:`~wagtail.wagtailcore.middleware.SiteMiddleware` middleware class which checks each request against this configuration and appends the Site object to the Django request object. +This configuration is used by the :class:`~wagtail.core.middleware.SiteMiddleware` middleware class which checks each request against this configuration and appends the Site object to the Django request object. Database fields ~~~~~~~~~~~~~~~ @@ -255,7 +255,7 @@ Database fields .. attribute:: root_page - (foreign key to :class:`~wagtail.wagtailcore.models.Page`) + (foreign key to :class:`~wagtail.core.models.Page`) This is a link to the root page of the site. This page will be what appears at the ``/`` URL on the site and would usually be a homepage. @@ -293,9 +293,9 @@ Methods and properties Every time a page is edited a new ``PageRevision`` is created and saved to the database. It can be used to find the full history of all changes that have been made to a page and it also provides a place for new changes to be kept before going live. - - Revisions can be created from any :class:`~wagtail.wagtailcore.models.Page` object by calling its :meth:`~Page.save_revision` method + - Revisions can be created from any :class:`~wagtail.core.models.Page` object by calling its :meth:`~Page.save_revision` method - The content of the page is JSON-serialised and stored in the :attr:`~PageRevision.content_json` field - - You can retrieve a ``PageRevision`` as a :class:`~wagtail.wagtailcore.models.Page` object by calling the :meth:`~PageRevision.as_page_object` method + - You can retrieve a ``PageRevision`` as a :class:`~wagtail.core.models.Page` object by calling the :meth:`~PageRevision.as_page_object` method Database fields ~~~~~~~~~~~~~~~ @@ -304,7 +304,7 @@ Database fields .. attribute:: page - (foreign key to :class:`~wagtail.wagtailcore.models.Page`) + (foreign key to :class:`~wagtail.core.models.Page`) .. attribute:: submitted_for_moderation @@ -362,7 +362,7 @@ Methods and properties .. automethod:: as_page_object - This method retrieves this revision as an instance of its :class:`~wagtail.wagtailcore.models.Page` subclass. + This method retrieves this revision as an instance of its :class:`~wagtail.core.models.Page` subclass. .. automethod:: approve_moderation @@ -394,7 +394,7 @@ Database fields .. attribute:: page - (foreign key to :class:`~wagtail.wagtailcore.models.Page`) + (foreign key to :class:`~wagtail.core.models.Page`) .. attribute:: permission_type @@ -410,7 +410,7 @@ Database fields .. attribute:: page - (foreign key to :class:`~wagtail.wagtailcore.models.Page`) + (foreign key to :class:`~wagtail.core.models.Page`) .. attribute:: password diff --git a/docs/reference/pages/panels.rst b/docs/reference/pages/panels.rst index d8b35386d..4d35136bc 100644 --- a/docs/reference/pages/panels.rst +++ b/docs/reference/pages/panels.rst @@ -96,11 +96,11 @@ PageChooserPanel .. class:: PageChooserPanel(field_name, page_type=None, can_choose_root=False) - You can explicitly link :class:`~wagtail.wagtailcore.models.Page`-derived models together using the :class:`~wagtail.wagtailcore.models.Page` model and ``PageChooserPanel``. + You can explicitly link :class:`~wagtail.core.models.Page`-derived models together using the :class:`~wagtail.core.models.Page` model and ``PageChooserPanel``. .. code-block:: python - from wagtail.wagtailcore.models import Page + from wagtail.core.models import Page from wagtail.wagtailadmin.edit_handlers import PageChooserPanel @@ -294,11 +294,11 @@ Inline Panels and Model Clusters The ``django-modelcluster`` module allows for streamlined relation of extra models to a Wagtail page. For instance, you can create objects related through a ``ForeignKey`` relationship on the fly and save them to a draft revision of a ``Page`` object. Normally, your related objects "cluster" would need to be created beforehand (or asynchronously) before linking them to a Page. -Let's look at the example of adding related links to a :class:`~wagtail.wagtailcore.models.Page`-derived model. We want to be able to add as many as we like, assign an order, and do all of this without leaving the page editing screen. +Let's look at the example of adding related links to a :class:`~wagtail.core.models.Page`-derived model. We want to be able to add as many as we like, assign an order, and do all of this without leaving the page editing screen. .. code-block:: python - from wagtail.wagtailcore.models import Orderable, Page + from wagtail.core.models import Orderable, Page from modelcluster.fields import ParentalKey # The abstract model for related links, complete with panels diff --git a/docs/reference/pages/queryset_reference.rst b/docs/reference/pages/queryset_reference.rst index 7d79fc0d7..d67e18a04 100644 --- a/docs/reference/pages/queryset_reference.rst +++ b/docs/reference/pages/queryset_reference.rst @@ -2,7 +2,7 @@ Page QuerySet reference ======================= -All models that inherit from :class:`~wagtail.wagtailcore.models.Page` are given some extra QuerySet methods accessible from their ``.objects`` attribute. +All models that inherit from :class:`~wagtail.core.models.Page` are given some extra QuerySet methods accessible from their ``.objects`` attribute. Examples @@ -31,7 +31,7 @@ Examples Reference ========= -.. automodule:: wagtail.wagtailcore.query +.. automodule:: wagtail.core.query .. autoclass:: PageQuerySet .. automethod:: live @@ -248,6 +248,6 @@ Reference # in a minimum number of database queries. homepage.get_children().specific() - See also: :py:attr:`Page.specific ` + See also: :py:attr:`Page.specific ` .. automethod:: first_common_ancestor diff --git a/docs/reference/signals.rst b/docs/reference/signals.rst index a53c1221a..f12028fba 100644 --- a/docs/reference/signals.rst +++ b/docs/reference/signals.rst @@ -25,7 +25,7 @@ example showing how you might notify your team when something is published: .. code-block:: python - from wagtail.wagtailcore.signals import page_published + from wagtail.core.signals import page_published import urllib import urllib2 @@ -58,7 +58,7 @@ wish to do something when a new blog post is published: .. code-block:: python - from wagtail.wagtailcore.signals import page_published + from wagtail.core.signals import page_published from mysite.models import BlogPostPage # Do something clever for each model type @@ -69,7 +69,7 @@ wish to do something when a new blog post is published: # Register listeners for each page model class page_published.connect(receiver, sender=BlogPostPage) -Wagtail provides access to a list of registered page types through the ``get_page_models()`` function in ``wagtail.wagtailcore.models``. +Wagtail provides access to a list of registered page types through the ``get_page_models()`` function in ``wagtail.core.models``. Read the `Django documentation `__ for more information about specifying senders. diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst index 59220a77c..1145829e0 100644 --- a/docs/releases/0.4.rst +++ b/docs/releases/0.4.rst @@ -38,7 +38,7 @@ Search on QuerySet with Elasticsearch It's now possible to perform searches with Elasticsearch on ``PageQuerySet`` objects: - >>> from wagtail.wagtailcore.models import Page + >>> from wagtail.core.models import Page >>> Page.objects.live().descendant_of(events_index).search("Hello") [, ] @@ -196,7 +196,7 @@ Wagtailadmins ``hooks`` module has moved to wagtailcore If you use any ``wagtail_hooks.py`` files in your project, you may have an import like: ``from wagtail.wagtailadmin import hooks`` -Change this to: ``from wagtail.wagtailcore import hooks`` +Change this to: ``from wagtail.core import hooks`` Miscellaneous diff --git a/docs/releases/1.11.rst b/docs/releases/1.11.rst index c6ccaa6fc..234f700bc 100644 --- a/docs/releases/1.11.rst +++ b/docs/releases/1.11.rst @@ -119,8 +119,8 @@ to: and passing those through at the point where you are calling ``get_url_parts`` on ``super`` (if applicable). -See also: :meth:`wagtail.wagtailcore.models.Page.get_url_parts`, :meth:`wagtail.wagtailcore.models.Page.get_url`, -:meth:`wagtail.wagtailcore.models.Page.get_full_url`, and :meth:`wagtail.wagtailcore.models.Page.relative_url` +See also: :meth:`wagtail.core.models.Page.get_url_parts`, :meth:`wagtail.core.models.Page.get_url`, +:meth:`wagtail.core.models.Page.get_full_url`, and :meth:`wagtail.core.models.Page.relative_url` "Password required" template for documents diff --git a/docs/releases/1.2.rst b/docs/releases/1.2.rst index a6b24d38a..89044f46c 100644 --- a/docs/releases/1.2.rst +++ b/docs/releases/1.2.rst @@ -113,7 +113,7 @@ Bug fixes * Dropdown for ``ForeignKey`` s are now styled consistently (Ashia Zawaduk) * Date choosers now appear on top of StreamField menus (Sergey Nikitin) * Fixed a migration error that was raised when block-updating from 0.8 to 1.1+ - * :meth:`Page.copy() ` no longer breaks on models with a ``ClusterTaggableManager`` or ``ManyToManyField`` + * :meth:`Page.copy() ` no longer breaks on models with a ``ClusterTaggableManager`` or ``ManyToManyField`` * Validation errors when inserting an embed into a rich text area are now reported back to the editor Upgrade considerations @@ -182,7 +182,7 @@ Wagtail API requires adding ``rest_framework`` to INSTALLED_APPS If you have the Wagtail API (``wagtail.contrib.wagtailapi``) enabled, you must now add ``'rest_framework'`` to your project's ``INSTALLED_APPS`` setting. In the current version the API will continue to function without this app, but the browsable front-end will not be available; this ability will be dropped in a future release. -:meth:`Page.get_latest_revision_as_page() ` now returns live page object when there are no draft changes +:meth:`Page.get_latest_revision_as_page() ` now returns live page object when there are no draft changes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ If you have any application code that makes direct updates to page data, at the model or database level, be aware that the way these edits are reflected in the page editor has changed. diff --git a/docs/releases/1.3.rst b/docs/releases/1.3.rst index 55228c50e..e752e1f21 100644 --- a/docs/releases/1.3.rst +++ b/docs/releases/1.3.rst @@ -113,7 +113,7 @@ Due to a change in the way template tags are imported in Django 1.9, it has been 'APP_DIRS': True, 'OPTIONS': { 'extensions': [ - 'wagtail.wagtailcore.jinja2tags.core', + 'wagtail.core.jinja2tags.core', 'wagtail.wagtailadmin.jinja2tags.userbar', 'wagtail.wagtailimages.jinja2tags.images', ], diff --git a/docs/releases/1.6.1.rst b/docs/releases/1.6.1.rst index f05e5cb79..d4c061002 100644 --- a/docs/releases/1.6.1.rst +++ b/docs/releases/1.6.1.rst @@ -20,7 +20,7 @@ Bug fixes ~~~~~~~~~ * Wagtail's middleware classes are now compatible with Django 1.10's `new-style middleware `_ (Karl Hobley) -* The :meth:`~wagtail.wagtailcore.models.Page.can_create_at` method is now checked in the create page view (Mikalai Radchuk) +* The :meth:`~wagtail.core.models.Page.can_create_at` method is now checked in the create page view (Mikalai Radchuk) * Fixed regression on Django 1.10.1 causing Page subclasses to fail to use PageManager (Matt Westcott) * ChoiceBlocks with lazy translations as option labels no longer break Elasticsearch indexing (Matt Westcott) * The page editor no longer fails to load JavaScript files with ``ManifestStaticFilesStorage`` (Matt Westcott) diff --git a/docs/releases/1.8.rst b/docs/releases/1.8.rst index 3f648e822..94ff52fad 100644 --- a/docs/releases/1.8.rst +++ b/docs/releases/1.8.rst @@ -70,7 +70,7 @@ Other features * ``ChoiceBlock`` now accepts a callable as the choices list (Mikalai Radchuk) * Redundant action buttons are now omitted from the root page in the explorer (Nick Smith) * Locked pages are now disabled from editing at the browser level (Edd Baldry) - * Added :meth:`wagtail.wagtailcore.query.PageQuerySet.in_site` method for filtering page querysets to pages within the specified site (Chris Rogers) + * Added :meth:`wagtail.core.query.PageQuerySet.in_site` method for filtering page querysets to pages within the specified site (Chris Rogers) * Added the ability to override the default index settings for Elasticsearch. See :ref:`wagtailsearch_backends_elasticsearch` (PyMan Claudio Marinozzi) * Extra options for the Elasticsearch constructor should be now defined with the new key ``OPTIONS`` of the ``WAGTAILSEARCH_BACKENDS`` setting (PyMan Claudio Marinozzi) diff --git a/docs/topics/pages.rst b/docs/topics/pages.rst index 70b6f0b12..c5bd827ff 100644 --- a/docs/topics/pages.rst +++ b/docs/topics/pages.rst @@ -2,9 +2,9 @@ Page models =========== -Each page type (a.k.a. content type) in Wagtail is represented by a Django model. All page models must inherit from the :class:`wagtail.wagtailcore.models.Page` class. +Each page type (a.k.a. content type) in Wagtail is represented by a Django model. All page models must inherit from the :class:`wagtail.core.models.Page` class. -As all page types are Django models, you can use any field type that Django provides. See `Model field reference `_ for a complete list of field types you can use. Wagtail also provides :class:`~wagtail.wagtailcore.fields.RichTextField` which provides a WYSIWYG editor for editing rich-text content. +As all page types are Django models, you can use any field type that Django provides. See `Model field reference `_ for a complete list of field types you can use. Wagtail also provides :class:`~wagtail.core.fields.RichTextField` which provides a WYSIWYG editor for editing rich-text content. .. topic:: Django models @@ -26,8 +26,8 @@ This example represents a typical blog post: from modelcluster.fields import ParentalKey - from wagtail.wagtailcore.models import Page, Orderable - from wagtail.wagtailcore.fields import RichTextField + from wagtail.core.models import Page, Orderable + from wagtail.core.fields import RichTextField from wagtail.wagtailadmin.edit_handlers import FieldPanel, MultiFieldPanel, InlinePanel from wagtail.wagtailimages.edit_handlers import ImageChooserPanel from wagtail.wagtailsearch import index @@ -221,7 +221,7 @@ and pass those through at the point where you are calling ``get_url_parts`` on ` While you could pass only the ``request`` keyword argument, passing all arguments as-is ensures compatibility with any future changes to these method signatures. -For more information, please see :meth:`wagtail.wagtailcore.models.Page.get_url_parts`. +For more information, please see :meth:`wagtail.core.models.Page.get_url_parts`. Obtaining URLs for page instances ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -232,9 +232,9 @@ A common use case for ``get_url(request)`` is in any custom template tag your pr custom template tag, ensure it includes ``takes_context=True`` and use ``context.get('request')`` to safely pass the request or ``None`` if no request exists in the context. -For more information, please see :meth:`wagtail.wagtailcore.models.Page.get_url`. +For more information, please see :meth:`wagtail.core.models.Page.get_url`. -In the event a full URL (including the protocol and domain) is needed, ``Page.get_full_url(request)`` can be used instead. Whenever possible, the optional ``request`` argument should be included to enable per-request caching of site-level URL information. For more information, please see :meth:`wagtail.wagtailcore.models.Page.get_full_url`. +In the event a full URL (including the protocol and domain) is needed, ``Page.get_full_url(request)`` can be used instead. Whenever possible, the optional ``request`` argument should be included to enable per-request caching of site-level URL information. For more information, please see :meth:`wagtail.core.models.Page.get_full_url`. Template rendering ================== @@ -360,7 +360,7 @@ Wagtail can nest the content of other models within the page. This is useful for Each inline model requires the following: - - It must inherit from :class:`wagtail.wagtailcore.models.Orderable` + - It must inherit from :class:`wagtail.core.models.Orderable` - It must have a ``ParentalKey`` to the parent model .. note:: django-modelcluster and ParentalKey @@ -380,7 +380,7 @@ For example, the following inline model can be used to add related links (a list from django.db import models from modelcluster.fields import ParentalKey - from wagtail.wagtailcore.models import Orderable + from wagtail.core.models import Orderable class BlogPageRelatedLink(Orderable): @@ -411,16 +411,16 @@ Working with pages Wagtail uses Django's `multi-table inheritance `_ feature to allow multiple page models to be used in the same tree. -Each page is added to both Wagtail's builtin :class:`~wagtail.wagtailcore.models.Page` model as well as its user-defined model (such as the ``BlogPage`` model created earlier). +Each page is added to both Wagtail's builtin :class:`~wagtail.core.models.Page` model as well as its user-defined model (such as the ``BlogPage`` model created earlier). Pages can exist in Python code in two forms, an instance of ``Page`` or an instance of the page model. - When working with multiple page types together, you will typically use instances of Wagtail's :class:`~wagtail.wagtailcore.models.Page` model, which don't give you access to any fields specific to their type. + When working with multiple page types together, you will typically use instances of Wagtail's :class:`~wagtail.core.models.Page` model, which don't give you access to any fields specific to their type. .. code-block:: python # Get all pages in the database - >>> from wagtail.wagtailcore.models import Page + >>> from wagtail.core.models import Page >>> Page.objects.all() [, , , , ] @@ -490,12 +490,12 @@ This is because ``Page`` enforces ordering QuerySets by path. Instead, you must Custom Page managers -------------------- -You can add a custom ``Manager`` to your ``Page`` class. Any custom Managers should inherit from :class:`wagtail.wagtailcore.models.PageManager`: +You can add a custom ``Manager`` to your ``Page`` class. Any custom Managers should inherit from :class:`wagtail.core.models.PageManager`: .. code-block:: python from django.db import models - from wagtail.wagtailcore.models import Page, PageManager + from wagtail.core.models import Page, PageManager class EventPageManager(PageManager): """ Custom manager for Event pages """ @@ -505,13 +505,13 @@ You can add a custom ``Manager`` to your ``Page`` class. Any custom Managers sho objects = EventPageManager() -Alternately, if you only need to add extra ``QuerySet`` methods, you can inherit from :class:`wagtail.wagtailcore.models.PageQuerySet`, and call :func:`~django.db.models.managers.Manager.from_queryset` to build a custom ``Manager``: +Alternately, if you only need to add extra ``QuerySet`` methods, you can inherit from :class:`wagtail.core.models.PageQuerySet`, and call :func:`~django.db.models.managers.Manager.from_queryset` to build a custom ``Manager``: .. code-block:: python from django.db import models from django.utils import timezone - from wagtail.wagtailcore.models import Page, PageManager, PageQuerySet + from wagtail.core.models import Page, PageManager, PageQuerySet class EventPageQuerySet(PageQuerySet): def future(self): diff --git a/docs/topics/search/searching.rst b/docs/topics/search/searching.rst index a9f510230..e3269bb1f 100644 --- a/docs/topics/search/searching.rst +++ b/docs/topics/search/searching.rst @@ -23,7 +23,7 @@ Wagtail provides a shortcut for searching pages: the ``.search()`` ``QuerySet`` .. code-block:: python # Search future EventPages - >>> from wagtail.wagtailcore.models import EventPage + >>> from wagtail.core.models import EventPage >>> EventPage.objects.filter(date__gt=timezone.now()).search("Hello world!") @@ -206,7 +206,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.wagtailcore.models import Page + from wagtail.core.models import Page from wagtail.wagtailsearch.models import Query diff --git a/docs/topics/snippets.rst b/docs/topics/snippets.rst index 3656547cd..f2e7728a7 100644 --- a/docs/topics/snippets.rst +++ b/docs/topics/snippets.rst @@ -129,7 +129,7 @@ To attach multiple adverts to a page, the ``SnippetChooserPanel`` can be placed from django.db import models - from wagtail.wagtailcore.models import Page, Orderable + from wagtail.core.models import Page, Orderable from wagtail.wagtailsnippets.edit_handlers import SnippetChooserPanel from modelcluster.fields import ParentalKey diff --git a/docs/topics/streamfield.rst b/docs/topics/streamfield.rst index 8a50a0681..8ca0e0a7b 100644 --- a/docs/topics/streamfield.rst +++ b/docs/topics/streamfield.rst @@ -19,9 +19,9 @@ Using StreamField from django.db import models - from wagtail.wagtailcore.models import Page - from wagtail.wagtailcore.fields import StreamField - from wagtail.wagtailcore import blocks + from wagtail.core.models import Page + from wagtail.core.fields import StreamField + from wagtail.core import blocks from wagtail.wagtailadmin.edit_handlers import FieldPanel, StreamFieldPanel from wagtail.wagtailimages.blocks import ImageChooserBlock @@ -74,7 +74,7 @@ The basic block types provided by Wagtail are as follows: CharBlock ~~~~~~~~~ -``wagtail.wagtailcore.blocks.CharBlock`` +``wagtail.core.blocks.CharBlock`` A single-line text input. The following keyword arguments are accepted: @@ -90,14 +90,14 @@ A single-line text input. The following keyword arguments are accepted: TextBlock ~~~~~~~~~ -``wagtail.wagtailcore.blocks.TextBlock`` +``wagtail.core.blocks.TextBlock`` A multi-line text input. As with ``CharBlock``, the keyword arguments ``required`` (default: True), ``max_length``, ``min_length`` and ``help_text`` are accepted. EmailBlock ~~~~~~~~~~ -``wagtail.wagtailcore.blocks.EmailBlock`` +``wagtail.core.blocks.EmailBlock`` A single-line email input that validates that the email is a valid Email Address. The keyword arguments ``required`` (default: True) and ``help_text`` are accepted. @@ -106,7 +106,7 @@ For an example of ``EmailBlock`` in use, see :ref:`streamfield_personblock_examp IntegerBlock ~~~~~~~~~~~~ -``wagtail.wagtailcore.blocks.IntegerBlock`` +``wagtail.core.blocks.IntegerBlock`` A single-line integer input that validates that the integer is a valid whole number. The keyword arguments ``required`` (default: True), ``max_value``, ``min_value`` and ``help_text`` are accepted. @@ -115,14 +115,14 @@ For an example of ``IntegerBlock`` in use, see :ref:`streamfield_personblock_exa FloatBlock ~~~~~~~~~~ -``wagtail.wagtailcore.blocks.FloatBlock`` +``wagtail.core.blocks.FloatBlock`` A single-line Float input that validates that the value is a valid floating point number. The keyword arguments ``required`` (default: True), ``max_value`` and ``min_value`` are accepted. DecimalBlock ~~~~~~~~~~~~ -``wagtail.wagtailcore.blocks.DecimalBlock`` +``wagtail.core.blocks.DecimalBlock`` A single-line decimal input that validates that the value is a valid decimal number. The keyword arguments ``required`` (default: True), ``help_text``, ``max_value``, ``min_value``, ``max_digits`` and ``decimal_places`` are accepted. @@ -131,7 +131,7 @@ For an example of ``DecimalBlock`` in use, see :ref:`streamfield_personblock_exa RegexBlock ~~~~~~~~~~ -``wagtail.wagtailcore.blocks.RegexBlock`` +``wagtail.core.blocks.RegexBlock`` A single-line text input that validates a string against a regex expression. The regular expression used for validation must be supplied as the first argument, or as the keyword argument ``regex``. To customise the message text used to indicate a validation error, pass a dictionary as the keyword argument ``error_messages`` containing either or both of the keys ``required`` (for the message shown on an empty value) or ``invalid`` (for the message shown on a non-matching value): @@ -146,21 +146,21 @@ The keyword arguments ``regex``, ``help_text``, ``required`` (default: True), `` URLBlock ~~~~~~~~ -``wagtail.wagtailcore.blocks.URLBlock`` +``wagtail.core.blocks.URLBlock`` A single-line text input that validates that the string is a valid URL. The keyword arguments ``required`` (default: True), ``max_length``, ``min_length`` and ``help_text`` are accepted. BooleanBlock ~~~~~~~~~~~~ -``wagtail.wagtailcore.blocks.BooleanBlock`` +``wagtail.core.blocks.BooleanBlock`` A checkbox. The keyword arguments ``required`` and ``help_text`` are accepted. As with Django's ``BooleanField``, a value of ``required=True`` (the default) indicates that the checkbox must be ticked in order to proceed. For a checkbox that can be ticked or unticked, you must explicitly pass in ``required=False``. DateBlock ~~~~~~~~~ -``wagtail.wagtailcore.blocks.DateBlock`` +``wagtail.core.blocks.DateBlock`` A date picker. The keyword arguments ``required`` (default: True), ``help_text`` and ``format`` are accepted. @@ -170,14 +170,14 @@ A date picker. The keyword arguments ``required`` (default: True), ``help_text`` TimeBlock ~~~~~~~~~ -``wagtail.wagtailcore.blocks.TimeBlock`` +``wagtail.core.blocks.TimeBlock`` A time picker. The keyword arguments ``required`` (default: True) and ``help_text`` are accepted. DateTimeBlock ~~~~~~~~~~~~~ -``wagtail.wagtailcore.blocks.DateTimeBlock`` +``wagtail.core.blocks.DateTimeBlock`` A combined date / time picker. The keyword arguments ``required`` (default: True), ``help_text`` and ``format`` are accepted. @@ -187,14 +187,14 @@ A combined date / time picker. The keyword arguments ``required`` (default: True RichTextBlock ~~~~~~~~~~~~~ -``wagtail.wagtailcore.blocks.RichTextBlock`` +``wagtail.core.blocks.RichTextBlock`` A WYSIWYG editor for creating formatted text including links, bold / italics etc. The keyword argument ``features`` is accepted, to specify the set of features allowed (see :ref:`rich_text_features`). RawHTMLBlock ~~~~~~~~~~~~ -``wagtail.wagtailcore.blocks.RawHTMLBlock`` +``wagtail.core.blocks.RawHTMLBlock`` A text area for entering raw HTML which will be rendered unescaped in the page output. The keyword arguments ``required`` (default: True), ``max_length``, ``min_length`` and ``help_text`` are accepted. @@ -204,7 +204,7 @@ A text area for entering raw HTML which will be rendered unescaped in the page o BlockQuoteBlock ~~~~~~~~~~~~~~~ -``wagtail.wagtailcore.blocks.BlockQuoteBlock`` +``wagtail.core.blocks.BlockQuoteBlock`` A text field, the contents of which will be wrapped in an HTML `
` tag pair. The keyword arguments ``required`` (default: True), ``max_length``, ``min_length`` and ``help_text`` are accepted. @@ -212,7 +212,7 @@ A text field, the contents of which will be wrapped in an HTML `
` ta ChoiceBlock ~~~~~~~~~~~ -``wagtail.wagtailcore.blocks.ChoiceBlock`` +``wagtail.core.blocks.ChoiceBlock`` A dropdown select box for choosing from a list of choices. The following keyword arguments are accepted: @@ -254,7 +254,7 @@ could be rewritten as a subclass of ChoiceBlock: PageChooserBlock ~~~~~~~~~~~~~~~~ -``wagtail.wagtailcore.blocks.PageChooserBlock`` +``wagtail.core.blocks.PageChooserBlock`` A control for selecting a page object, using Wagtail's page browser. The following keyword arguments are accepted: @@ -301,7 +301,7 @@ A field for the editor to enter a URL to a media item (such as a YouTube video) StaticBlock ~~~~~~~~~~~ -``wagtail.wagtailcore.blocks.StaticBlock`` +``wagtail.core.blocks.StaticBlock`` A block which doesn't have any fields, thus passes no particular values to its template during rendering. This can be useful if you need the editor to be able to insert some content which is always the same or doesn't need to be configured within the page editor, such as an address, embed code from third-party services, or more complex pieces of code if the template uses template tags. @@ -334,7 +334,7 @@ In addition to the basic block types above, it is possible to define new block t StructBlock ~~~~~~~~~~~ -``wagtail.wagtailcore.blocks.StructBlock`` +``wagtail.core.blocks.StructBlock`` A block consisting of a fixed group of sub-blocks to be displayed together. Takes a list of ``(name, block_definition)`` tuples as its first argument: @@ -381,7 +381,7 @@ Further options are available for customising the display of a ``StructBlock`` w ListBlock ~~~~~~~~~ -``wagtail.wagtailcore.blocks.ListBlock`` +``wagtail.core.blocks.ListBlock`` A block consisting of many sub-blocks, all of the same type. The editor can add an unlimited number of sub-blocks, and re-order and delete them. Takes the definition of the sub-block as its first argument: @@ -403,7 +403,7 @@ Any block type is valid as the sub-block type, including structural types: StreamBlock ~~~~~~~~~~~ -``wagtail.wagtailcore.blocks.StreamBlock`` +``wagtail.core.blocks.StreamBlock`` A block consisting of a sequence of sub-blocks of different types, which can be mixed and reordered at will. Used as the overall mechanism of the StreamField itself, but can also be nested or used within other structural block types. Takes a list of ``(name, block_definition)`` tuples as its first argument: @@ -469,7 +469,7 @@ This example demonstrates how the basic block types introduced above can be comb .. code-block:: python - from wagtail.wagtailcore import blocks + from wagtail.core import blocks class PersonBlock(blocks.StructBlock): name = blocks.CharBlock() @@ -853,7 +853,7 @@ Custom block types If you need to implement a custom UI, or handle a datatype that is not provided by Wagtail's built-in block types (and cannot built up as a structure of existing fields), it is possible to define your own custom block types. For further guidance, refer to the source code of Wagtail's built-in block classes. -For block types that simply wrap an existing Django form field, Wagtail provides an abstract class ``wagtail.wagtailcore.blocks.FieldBlock`` as a helper. Subclasses just need to set a ``field`` property that returns the form field object: +For block types that simply wrap an existing Django form field, Wagtail provides an abstract class ``wagtail.core.blocks.FieldBlock`` as a helper. Subclasses just need to set a ``field`` property that returns the form field object: .. code-block:: python @@ -888,7 +888,7 @@ If you change an existing RichTextField to a StreamField, and create and run mig from __future__ import unicode_literals from django.db import models, migrations - from wagtail.wagtailcore.rich_text import RichText + from wagtail.core.rich_text import RichText def convert_to_streamfield(apps, schema_editor): @@ -938,7 +938,7 @@ Note that the above migration will work on published Page objects only. If you a from django.core.serializers.json import DjangoJSONEncoder from django.db import migrations, models - from wagtail.wagtailcore.rich_text import RichText + from wagtail.core.rich_text import RichText def page_to_streamfield(page): diff --git a/wagtail/api/v2/endpoints.py b/wagtail/api/v2/endpoints.py index b2b08760b..57f246859 100644 --- a/wagtail/api/v2/endpoints.py +++ b/wagtail/api/v2/endpoints.py @@ -13,7 +13,7 @@ from rest_framework.response import Response from rest_framework.viewsets import GenericViewSet from wagtail.api import APIField -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from .filters import ( FieldsFilter, OrderingFilter, RestrictedChildOfFilter, RestrictedDescendantOfFilter, diff --git a/wagtail/api/v2/filters.py b/wagtail/api/v2/filters.py index 0e0a554ff..72d28c5f0 100644 --- a/wagtail/api/v2/filters.py +++ b/wagtail/api/v2/filters.py @@ -5,8 +5,8 @@ from django.db import models from rest_framework.filters import BaseFilterBackend from taggit.managers import TaggableManager -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Page +from wagtail.core import hooks +from wagtail.core.models import Page from wagtail.wagtailsearch.backends import get_search_backend from .utils import BadRequestError, pages_for_site, parse_boolean diff --git a/wagtail/api/v2/serializers.py b/wagtail/api/v2/serializers.py index 64aad0e9b..85436a96f 100644 --- a/wagtail/api/v2/serializers.py +++ b/wagtail/api/v2/serializers.py @@ -8,7 +8,7 @@ from rest_framework import relations, serializers from rest_framework.fields import Field, SkipField from taggit.managers import _TaggableManager -from wagtail.wagtailcore import fields as wagtailcore_fields +from wagtail.core import fields as wagtailcore_fields from .utils import get_full_url, pages_for_site diff --git a/wagtail/api/v2/signal_handlers.py b/wagtail/api/v2/signal_handlers.py index 62cce747e..7d1fa79c7 100644 --- a/wagtail/api/v2/signal_handlers.py +++ b/wagtail/api/v2/signal_handlers.py @@ -4,8 +4,8 @@ from django.db.models.signals import post_delete, post_save from django.urls import reverse from wagtail.contrib.wagtailfrontendcache.utils import purge_url_from_cache -from wagtail.wagtailcore.models import get_page_models -from wagtail.wagtailcore.signals import page_published, page_unpublished +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.wagtailimages import get_image_model diff --git a/wagtail/api/v2/tests/test_pages.py b/wagtail/api/v2/tests/test_pages.py index c2985d74e..bfa5a8a6f 100644 --- a/wagtail/api/v2/tests/test_pages.py +++ b/wagtail/api/v2/tests/test_pages.py @@ -11,7 +11,7 @@ from django.urls import reverse from wagtail.api.v2 import signal_handlers from wagtail.tests.demosite import models from wagtail.tests.testapp.models import StreamPage -from wagtail.wagtailcore.models import Page, Site +from wagtail.core.models import Page, Site def get_total_page_count(): diff --git a/wagtail/api/v2/utils.py b/wagtail/api/v2/utils.py index 616770c06..b66e148e8 100644 --- a/wagtail/api/v2/utils.py +++ b/wagtail/api/v2/utils.py @@ -4,8 +4,8 @@ from urllib.parse import urlparse from django.conf import settings -from wagtail.wagtailcore.models import Page -from wagtail.wagtailcore.utils import resolve_model_string +from wagtail.core.models import Page +from wagtail.core.utils import resolve_model_string class BadRequestError(Exception): diff --git a/wagtail/contrib/modeladmin/forms.py b/wagtail/contrib/modeladmin/forms.py index d54831bb6..9357b69ad 100644 --- a/wagtail/contrib/modeladmin/forms.py +++ b/wagtail/contrib/modeladmin/forms.py @@ -4,7 +4,7 @@ from django import forms from django.utils.safestring import mark_safe from django.utils.translation import ugettext as _ -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page class PageChoiceField(forms.ModelChoiceField): diff --git a/wagtail/contrib/modeladmin/helpers/permission.py b/wagtail/contrib/modeladmin/helpers/permission.py index 7444f6d71..1acbdb3e4 100644 --- a/wagtail/contrib/modeladmin/helpers/permission.py +++ b/wagtail/contrib/modeladmin/helpers/permission.py @@ -4,7 +4,7 @@ from django.contrib.auth import get_permission_codename from django.contrib.auth.models import Permission from django.contrib.contenttypes.models import ContentType -from wagtail.wagtailcore.models import Page, UserPagePermissionsProxy +from wagtail.core.models import Page, UserPagePermissionsProxy class PermissionHelper(object): diff --git a/wagtail/contrib/modeladmin/options.py b/wagtail/contrib/modeladmin/options.py index 5a7e285e9..c747feb3a 100644 --- a/wagtail/contrib/modeladmin/options.py +++ b/wagtail/contrib/modeladmin/options.py @@ -6,8 +6,8 @@ from django.core.exceptions import ImproperlyConfigured from django.db.models import Model from django.utils.safestring import mark_safe -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Page +from wagtail.core import hooks +from wagtail.core.models import Page from .helpers import ( AdminURLHelper, ButtonHelper, PageAdminURLHelper, PageButtonHelper, PagePermissionHelper, diff --git a/wagtail/contrib/modeladmin/tests/test_page_modeladmin.py b/wagtail/contrib/modeladmin/tests/test_page_modeladmin.py index 7ec476ced..4ccbc3980 100644 --- a/wagtail/contrib/modeladmin/tests/test_page_modeladmin.py +++ b/wagtail/contrib/modeladmin/tests/test_page_modeladmin.py @@ -6,7 +6,7 @@ from django.test import TestCase from wagtail.tests.testapp.models import BusinessIndex, EventCategory, EventPage from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore.models import GroupPagePermission, Page +from wagtail.core.models import GroupPagePermission, Page class TestIndexView(TestCase, WagtailTestUtils): diff --git a/wagtail/contrib/settings/forms.py b/wagtail/contrib/settings/forms.py index 3d0d96412..9f778a614 100644 --- a/wagtail/contrib/settings/forms.py +++ b/wagtail/contrib/settings/forms.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django import forms from django.urls import reverse -from wagtail.wagtailcore.models import Site +from wagtail.core.models import Site class SiteSwitchForm(forms.Form): diff --git a/wagtail/contrib/settings/jinja2tags.py b/wagtail/contrib/settings/jinja2tags.py index 54dc9b60c..629970f41 100644 --- a/wagtail/contrib/settings/jinja2tags.py +++ b/wagtail/contrib/settings/jinja2tags.py @@ -7,7 +7,7 @@ from django.utils.encoding import force_str from jinja2.ext import Extension from wagtail.contrib.settings.registry import registry -from wagtail.wagtailcore.models import Site +from wagtail.core.models import Site # Settings are cached per template context, to prevent excessive database # lookups. The cached settings are disposed of once the template context is no diff --git a/wagtail/contrib/settings/registry.py b/wagtail/contrib/settings/registry.py index fcda1342f..590f5cbe3 100644 --- a/wagtail/contrib/settings/registry.py +++ b/wagtail/contrib/settings/registry.py @@ -6,7 +6,7 @@ from django.urls import reverse from django.utils.text import capfirst from wagtail.wagtailadmin.menu import MenuItem -from wagtail.wagtailcore import hooks +from wagtail.core import hooks from .permissions import user_can_edit_setting_type diff --git a/wagtail/contrib/settings/templatetags/wagtailsettings_tags.py b/wagtail/contrib/settings/templatetags/wagtailsettings_tags.py index d34443c4f..63e1f331f 100644 --- a/wagtail/contrib/settings/templatetags/wagtailsettings_tags.py +++ b/wagtail/contrib/settings/templatetags/wagtailsettings_tags.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.template import Library -from wagtail.wagtailcore.models import Site +from wagtail.core.models import Site from ..context_processors import SettingsProxy diff --git a/wagtail/contrib/settings/tests/test_admin.py b/wagtail/contrib/settings/tests/test_admin.py index 8adb43707..2800be292 100644 --- a/wagtail/contrib/settings/tests/test_admin.py +++ b/wagtail/contrib/settings/tests/test_admin.py @@ -11,8 +11,8 @@ from wagtail.contrib.settings.views import get_setting_edit_handler from wagtail.tests.testapp.models import ( FileUploadSetting, IconSetting, PanelSettings, TabbedSettings, TestSetting) from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Page, Site +from wagtail.core import hooks +from wagtail.core.models import Page, Site class TestSettingMenu(TestCase, WagtailTestUtils): diff --git a/wagtail/contrib/settings/tests/test_templates.py b/wagtail/contrib/settings/tests/test_templates.py index 01a76608b..5421cad80 100644 --- a/wagtail/contrib/settings/tests/test_templates.py +++ b/wagtail/contrib/settings/tests/test_templates.py @@ -5,7 +5,7 @@ from django.test import TestCase from wagtail.tests.testapp.models import TestSetting from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore.models import Page, Site +from wagtail.core.models import Page, Site class TemplateTestCase(TestCase, WagtailTestUtils): diff --git a/wagtail/contrib/settings/views.py b/wagtail/contrib/settings/views.py index f2aa5d7f2..05c4fa7dd 100644 --- a/wagtail/contrib/settings/views.py +++ b/wagtail/contrib/settings/views.py @@ -10,7 +10,7 @@ from django.utils.translation import ugettext as _ from wagtail.wagtailadmin import messages from wagtail.wagtailadmin.edit_handlers import ( ObjectList, extract_panel_definitions_from_model_class) -from wagtail.wagtailcore.models import Site +from wagtail.core.models import Site from .forms import SiteSwitchForm from .permissions import user_can_edit_setting_type diff --git a/wagtail/contrib/settings/wagtail_hooks.py b/wagtail/contrib/settings/wagtail_hooks.py index 88c59eb42..126867812 100644 --- a/wagtail/contrib/settings/wagtail_hooks.py +++ b/wagtail/contrib/settings/wagtail_hooks.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import include, url -from wagtail.wagtailcore import hooks +from wagtail.core import hooks from . import urls diff --git a/wagtail/contrib/table_block/blocks.py b/wagtail/contrib/table_block/blocks.py index 22acfdf05..58b5636b0 100644 --- a/wagtail/contrib/table_block/blocks.py +++ b/wagtail/contrib/table_block/blocks.py @@ -8,7 +8,7 @@ from django.utils import translation from django.utils.functional import cached_property from wagtail.utils.widgets import WidgetWithScript -from wagtail.wagtailcore.blocks import FieldBlock +from wagtail.core.blocks import FieldBlock class TableInput(WidgetWithScript, forms.HiddenInput): diff --git a/wagtail/contrib/wagtailfrontendcache/signal_handlers.py b/wagtail/contrib/wagtailfrontendcache/signal_handlers.py index 33cfe77c7..2cd116cae 100644 --- a/wagtail/contrib/wagtailfrontendcache/signal_handlers.py +++ b/wagtail/contrib/wagtailfrontendcache/signal_handlers.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.apps import apps from wagtail.contrib.wagtailfrontendcache.utils import purge_page_from_cache -from wagtail.wagtailcore.signals import page_published, page_unpublished +from wagtail.core.signals import page_published, page_unpublished def page_published_signal_handler(instance, **kwargs): diff --git a/wagtail/contrib/wagtailfrontendcache/tests.py b/wagtail/contrib/wagtailfrontendcache/tests.py index 5c833e90e..52d90e3d8 100644 --- a/wagtail/contrib/wagtailfrontendcache/tests.py +++ b/wagtail/contrib/wagtailfrontendcache/tests.py @@ -9,7 +9,7 @@ from wagtail.contrib.wagtailfrontendcache.backends import ( BaseBackend, CloudflareBackend, CloudfrontBackend, HTTPBackend) from wagtail.contrib.wagtailfrontendcache.utils import get_backends from wagtail.tests.testapp.models import EventIndex -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from .utils import ( PurgeBatch, purge_page_from_cache, purge_pages_from_cache, purge_url_from_cache, diff --git a/wagtail/contrib/wagtailroutablepage/models.py b/wagtail/contrib/wagtailroutablepage/models.py index c608169c3..c45f7d60a 100644 --- a/wagtail/contrib/wagtailroutablepage/models.py +++ b/wagtail/contrib/wagtailroutablepage/models.py @@ -5,8 +5,8 @@ from django.http import Http404 from django.template.response import TemplateResponse from django.urls.resolvers import RegexURLResolver -from wagtail.wagtailcore.models import Page -from wagtail.wagtailcore.url_routing import RouteResult +from wagtail.core.models import Page +from wagtail.core.url_routing import RouteResult _creation_counter = 0 diff --git a/wagtail/contrib/wagtailroutablepage/tests.py b/wagtail/contrib/wagtailroutablepage/tests.py index 2f3495993..4f93c8b53 100644 --- a/wagtail/contrib/wagtailroutablepage/tests.py +++ b/wagtail/contrib/wagtailroutablepage/tests.py @@ -8,7 +8,7 @@ from wagtail.contrib.wagtailroutablepage.templatetags.wagtailroutablepage_tags i routablepageurl from wagtail.tests.routablepage.models import ( RoutablePageTest, RoutablePageWithOverriddenIndexRouteTest) -from wagtail.wagtailcore.models import Page, Site +from wagtail.core.models import Page, Site class TestRoutablePage(TestCase): @@ -188,7 +188,7 @@ class TestRoutablePageTemplateTag(TestCase): self.assertEqual(url, self.routable_page.url + 'external/joe-bloggs/') def test_templatetag_reverse_external_view_without_append_slash(self): - with mock.patch('wagtail.wagtailcore.models.WAGTAIL_APPEND_SLASH', False): + with mock.patch('wagtail.core.models.WAGTAIL_APPEND_SLASH', False): url = routablepageurl(self.context, self.routable_page, 'external_view', 'joe-bloggs') expected = self.routable_page.url + '/' + 'external/joe-bloggs/' diff --git a/wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py b/wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py index 9ed4a2119..d4495a916 100644 --- a/wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py +++ b/wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py @@ -7,7 +7,7 @@ from django.utils.translation import ugettext_lazy as _ from wagtail.contrib.wagtailsearchpromotions import admin_urls from wagtail.wagtailadmin.menu import MenuItem -from wagtail.wagtailcore import hooks +from wagtail.core import hooks @hooks.register('register_admin_urls') diff --git a/wagtail/contrib/wagtailsitemaps/tests.py b/wagtail/contrib/wagtailsitemaps/tests.py index 4855280eb..461d1e4f0 100644 --- a/wagtail/contrib/wagtailsitemaps/tests.py +++ b/wagtail/contrib/wagtailsitemaps/tests.py @@ -7,7 +7,7 @@ from django.contrib.sites.shortcuts import get_current_site from django.test import RequestFactory, TestCase from wagtail.tests.testapp.models import EventIndex, SimplePage -from wagtail.wagtailcore.models import Page, PageViewRestriction, Site +from wagtail.core.models import Page, PageViewRestriction, Site from .sitemap_generator import Sitemap diff --git a/wagtail/contrib/wagtailstyleguide/views.py b/wagtail/contrib/wagtailstyleguide/views.py index a329970a4..113c2760d 100644 --- a/wagtail/contrib/wagtailstyleguide/views.py +++ b/wagtail/contrib/wagtailstyleguide/views.py @@ -10,7 +10,7 @@ from wagtail.wagtailadmin.forms import SearchForm from wagtail.wagtailadmin.rich_text import get_rich_text_editor_widget from wagtail.wagtailadmin.widgets import ( AdminAutoHeightTextInput, AdminDateInput, AdminDateTimeInput, AdminPageChooser, AdminTimeInput) -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from wagtail.wagtaildocs.widgets import AdminDocumentChooser from wagtail.wagtailimages.widgets import AdminImageChooser from wagtail.wagtailsnippets.widgets import AdminSnippetChooser diff --git a/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py b/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py index ad37ec42e..4aea6af84 100644 --- a/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py +++ b/wagtail/contrib/wagtailstyleguide/wagtail_hooks.py @@ -5,7 +5,7 @@ from django.urls import reverse from django.utils.translation import ugettext_lazy as _ from wagtail.wagtailadmin.menu import MenuItem -from wagtail.wagtailcore import hooks +from wagtail.core import hooks from . import views diff --git a/wagtail/wagtailcore/__init__.py b/wagtail/core/__init__.py similarity index 82% rename from wagtail/wagtailcore/__init__.py rename to wagtail/core/__init__.py index 4bfc307b9..040cb7f90 100644 --- a/wagtail/wagtailcore/__init__.py +++ b/wagtail/core/__init__.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals # Imported for historical reasons from wagtail import __semver__, __version__ # noqa -default_app_config = 'wagtail.wagtailcore.apps.WagtailCoreAppConfig' +default_app_config = 'wagtail.core.apps.WagtailCoreAppConfig' def setup(): diff --git a/wagtail/wagtailcore/admin.py b/wagtail/core/admin.py similarity index 91% rename from wagtail/wagtailcore/admin.py rename to wagtail/core/admin.py index 6a2c6e773..bfa3c7bc9 100644 --- a/wagtail/wagtailcore/admin.py +++ b/wagtail/core/admin.py @@ -4,7 +4,7 @@ from django.contrib import admin from django.contrib.auth.admin import GroupAdmin from django.contrib.auth.models import Group -from wagtail.wagtailcore.models import GroupPagePermission, Page, Site +from wagtail.core.models import GroupPagePermission, Page, Site admin.site.register(Site) admin.site.register(Page) diff --git a/wagtail/wagtailcore/apps.py b/wagtail/core/apps.py similarity index 68% rename from wagtail/wagtailcore/apps.py rename to wagtail/core/apps.py index 75eb832ce..3fe49dc98 100644 --- a/wagtail/wagtailcore/apps.py +++ b/wagtail/core/apps.py @@ -4,10 +4,10 @@ from django.apps import AppConfig class WagtailCoreAppConfig(AppConfig): - name = 'wagtail.wagtailcore' + name = 'wagtail.core' label = 'wagtailcore' verbose_name = "Wagtail core" def ready(self): - from wagtail.wagtailcore.signal_handlers import register_signal_handlers + from wagtail.core.signal_handlers import register_signal_handlers register_signal_handlers() diff --git a/wagtail/wagtailcore/blocks/__init__.py b/wagtail/core/blocks/__init__.py similarity index 73% rename from wagtail/wagtailcore/blocks/__init__.py rename to wagtail/core/blocks/__init__.py index 1b7a1740c..538180f47 100644 --- a/wagtail/wagtailcore/blocks/__init__.py +++ b/wagtail/core/blocks/__init__.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -# Import block types defined in submodules into the wagtail.wagtailcore.blocks namespace +# Import block types defined in submodules into the wagtail.core.blocks namespace from .base import * # NOQA from .field_block import * # NOQA from .struct_block import * # NOQA diff --git a/wagtail/wagtailcore/blocks/base.py b/wagtail/core/blocks/base.py similarity index 99% rename from wagtail/wagtailcore/blocks/base.py rename to wagtail/core/blocks/base.py index 747f42fab..6b0b7194b 100644 --- a/wagtail/wagtailcore/blocks/base.py +++ b/wagtail/core/blocks/base.py @@ -390,7 +390,7 @@ class Block(six.with_metaclass(BaseBlock, object)): # in all of these cases, including reporting StructBlock as the path: # # FooBlock().deconstruct() == ( - # 'wagtail.wagtailcore.blocks.StructBlock', + # 'wagtail.core.blocks.StructBlock', # [('first_name', CharBlock()), ('surname': CharBlock())], # {} # ) @@ -531,5 +531,5 @@ class BlockField(forms.Field): DECONSTRUCT_ALIASES = { - Block: 'wagtail.wagtailcore.blocks.Block', + Block: 'wagtail.core.blocks.Block', } diff --git a/wagtail/wagtailcore/blocks/field_block.py b/wagtail/core/blocks/field_block.py similarity index 98% rename from wagtail/wagtailcore/blocks/field_block.py rename to wagtail/core/blocks/field_block.py index 72560ff27..145cb653f 100644 --- a/wagtail/wagtailcore/blocks/field_block.py +++ b/wagtail/core/blocks/field_block.py @@ -12,8 +12,8 @@ from django.utils.functional import cached_property from django.utils.html import format_html from django.utils.safestring import mark_safe -from wagtail.wagtailcore.rich_text import RichText -from wagtail.wagtailcore.utils import resolve_model_string +from wagtail.core.rich_text import RichText +from wagtail.core.utils import resolve_model_string from .base import Block @@ -426,7 +426,7 @@ class ChoiceBlock(FieldBlock): users to define subclasses of ChoiceBlock in their models.py, with specific choice lists passed in, without references to those classes ending up frozen into migrations. """ - return ('wagtail.wagtailcore.blocks.ChoiceBlock', [], self._constructor_kwargs) + return ('wagtail.core.blocks.ChoiceBlock', [], self._constructor_kwargs) def get_searchable_content(self, value): # Return the display value as the searchable value @@ -676,7 +676,7 @@ block_classes = [ DecimalBlock, RegexBlock, BlockQuoteBlock ] DECONSTRUCT_ALIASES = { - cls: 'wagtail.wagtailcore.blocks.%s' % cls.__name__ + cls: 'wagtail.core.blocks.%s' % cls.__name__ for cls in block_classes } __all__ = [cls.__name__ for cls in block_classes] diff --git a/wagtail/wagtailcore/blocks/list_block.py b/wagtail/core/blocks/list_block.py similarity index 98% rename from wagtail/wagtailcore/blocks/list_block.py rename to wagtail/core/blocks/list_block.py index f12e4d0b8..771f4f18e 100644 --- a/wagtail/wagtailcore/blocks/list_block.py +++ b/wagtail/core/blocks/list_block.py @@ -8,7 +8,7 @@ from django.template.loader import render_to_string from django.utils.html import format_html, format_html_join from django.utils.safestring import mark_safe -from wagtail.wagtailcore.utils import escape_script +from wagtail.core.utils import escape_script from .base import Block from .utils import js_dict @@ -181,5 +181,5 @@ class ListBlock(Block): DECONSTRUCT_ALIASES = { - ListBlock: 'wagtail.wagtailcore.blocks.ListBlock', + ListBlock: 'wagtail.core.blocks.ListBlock', } diff --git a/wagtail/wagtailcore/blocks/static_block.py b/wagtail/core/blocks/static_block.py similarity index 100% rename from wagtail/wagtailcore/blocks/static_block.py rename to wagtail/core/blocks/static_block.py diff --git a/wagtail/wagtailcore/blocks/stream_block.py b/wagtail/core/blocks/stream_block.py similarity index 99% rename from wagtail/wagtailcore/blocks/stream_block.py rename to wagtail/core/blocks/stream_block.py index 00a0534e2..568bb5283 100644 --- a/wagtail/wagtailcore/blocks/stream_block.py +++ b/wagtail/core/blocks/stream_block.py @@ -14,7 +14,7 @@ from django.utils.html import format_html_join from django.utils.safestring import mark_safe from django.utils.translation import ugettext as _ -from wagtail.wagtailcore.utils import escape_script +from wagtail.core.utils import escape_script from .base import Block, BoundBlock, DeclarativeSubBlocksMetaclass from .utils import indent, js_dict @@ -296,7 +296,7 @@ class BaseStreamBlock(Block): This ensures that the field definitions get frozen into migrations, rather than leaving a reference to a custom subclass in the user's models.py that may or may not stick around. """ - path = 'wagtail.wagtailcore.blocks.StreamBlock' + path = 'wagtail.core.blocks.StreamBlock' args = [self.child_blocks.items()] kwargs = self._constructor_kwargs return (path, args, kwargs) diff --git a/wagtail/wagtailcore/blocks/struct_block.py b/wagtail/core/blocks/struct_block.py similarity index 99% rename from wagtail/wagtailcore/blocks/struct_block.py rename to wagtail/core/blocks/struct_block.py index d87c1d958..3a0a3cce8 100644 --- a/wagtail/wagtailcore/blocks/struct_block.py +++ b/wagtail/core/blocks/struct_block.py @@ -162,7 +162,7 @@ class BaseStructBlock(Block): This ensures that the field definitions get frozen into migrations, rather than leaving a reference to a custom subclass in the user's models.py that may or may not stick around. """ - path = 'wagtail.wagtailcore.blocks.StructBlock' + path = 'wagtail.core.blocks.StructBlock' args = [self.child_blocks.items()] kwargs = self._constructor_kwargs return (path, args, kwargs) diff --git a/wagtail/wagtailcore/blocks/utils.py b/wagtail/core/blocks/utils.py similarity index 100% rename from wagtail/wagtailcore/blocks/utils.py rename to wagtail/core/blocks/utils.py diff --git a/wagtail/wagtailcore/compat.py b/wagtail/core/compat.py similarity index 100% rename from wagtail/wagtailcore/compat.py rename to wagtail/core/compat.py diff --git a/wagtail/wagtailcore/fields.py b/wagtail/core/fields.py similarity index 98% rename from wagtail/wagtailcore/fields.py rename to wagtail/core/fields.py index 3bac8bc38..cc2963078 100644 --- a/wagtail/wagtailcore/fields.py +++ b/wagtail/core/fields.py @@ -5,7 +5,7 @@ import json from django.core.serializers.json import DjangoJSONEncoder from django.db import models -from wagtail.wagtailcore.blocks import Block, BlockField, StreamBlock, StreamValue +from wagtail.core.blocks import Block, BlockField, StreamBlock, StreamValue class RichTextField(models.TextField): diff --git a/wagtail/wagtailcore/forms.py b/wagtail/core/forms.py similarity index 100% rename from wagtail/wagtailcore/forms.py rename to wagtail/core/forms.py diff --git a/wagtail/wagtailcore/hooks.py b/wagtail/core/hooks.py similarity index 100% rename from wagtail/wagtailcore/hooks.py rename to wagtail/core/hooks.py diff --git a/wagtail/wagtailcore/jinja2tags.py b/wagtail/core/jinja2tags.py similarity index 100% rename from wagtail/wagtailcore/jinja2tags.py rename to wagtail/core/jinja2tags.py diff --git a/wagtail/wagtailcore/locale/ar/LC_MESSAGES/django.mo b/wagtail/core/locale/ar/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/ar/LC_MESSAGES/django.mo rename to wagtail/core/locale/ar/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/ar/LC_MESSAGES/django.po b/wagtail/core/locale/ar/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/ar/LC_MESSAGES/django.po rename to wagtail/core/locale/ar/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/bg/LC_MESSAGES/django.mo b/wagtail/core/locale/bg/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/bg/LC_MESSAGES/django.mo rename to wagtail/core/locale/bg/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/bg/LC_MESSAGES/django.po b/wagtail/core/locale/bg/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/bg/LC_MESSAGES/django.po rename to wagtail/core/locale/bg/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/ca/LC_MESSAGES/django.mo b/wagtail/core/locale/ca/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/ca/LC_MESSAGES/django.mo rename to wagtail/core/locale/ca/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/ca/LC_MESSAGES/django.po b/wagtail/core/locale/ca/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/ca/LC_MESSAGES/django.po rename to wagtail/core/locale/ca/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/cs/LC_MESSAGES/django.mo b/wagtail/core/locale/cs/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/cs/LC_MESSAGES/django.mo rename to wagtail/core/locale/cs/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/cs/LC_MESSAGES/django.po b/wagtail/core/locale/cs/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/cs/LC_MESSAGES/django.po rename to wagtail/core/locale/cs/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/de/LC_MESSAGES/django.mo b/wagtail/core/locale/de/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/de/LC_MESSAGES/django.mo rename to wagtail/core/locale/de/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/de/LC_MESSAGES/django.po b/wagtail/core/locale/de/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/de/LC_MESSAGES/django.po rename to wagtail/core/locale/de/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/el/LC_MESSAGES/django.mo b/wagtail/core/locale/el/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/el/LC_MESSAGES/django.mo rename to wagtail/core/locale/el/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/el/LC_MESSAGES/django.po b/wagtail/core/locale/el/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/el/LC_MESSAGES/django.po rename to wagtail/core/locale/el/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/en/LC_MESSAGES/django.mo b/wagtail/core/locale/en/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/en/LC_MESSAGES/django.mo rename to wagtail/core/locale/en/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/en/LC_MESSAGES/django.po b/wagtail/core/locale/en/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/en/LC_MESSAGES/django.po rename to wagtail/core/locale/en/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/es/LC_MESSAGES/django.mo b/wagtail/core/locale/es/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/es/LC_MESSAGES/django.mo rename to wagtail/core/locale/es/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/es/LC_MESSAGES/django.po b/wagtail/core/locale/es/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/es/LC_MESSAGES/django.po rename to wagtail/core/locale/es/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/fa/LC_MESSAGES/django.mo b/wagtail/core/locale/fa/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/fa/LC_MESSAGES/django.mo rename to wagtail/core/locale/fa/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/fa/LC_MESSAGES/django.po b/wagtail/core/locale/fa/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/fa/LC_MESSAGES/django.po rename to wagtail/core/locale/fa/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/fi/LC_MESSAGES/django.mo b/wagtail/core/locale/fi/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/fi/LC_MESSAGES/django.mo rename to wagtail/core/locale/fi/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/fi/LC_MESSAGES/django.po b/wagtail/core/locale/fi/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/fi/LC_MESSAGES/django.po rename to wagtail/core/locale/fi/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/fr/LC_MESSAGES/django.mo b/wagtail/core/locale/fr/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/fr/LC_MESSAGES/django.mo rename to wagtail/core/locale/fr/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/fr/LC_MESSAGES/django.po b/wagtail/core/locale/fr/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/fr/LC_MESSAGES/django.po rename to wagtail/core/locale/fr/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/gl/LC_MESSAGES/django.mo b/wagtail/core/locale/gl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/gl/LC_MESSAGES/django.mo rename to wagtail/core/locale/gl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/gl/LC_MESSAGES/django.po b/wagtail/core/locale/gl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/gl/LC_MESSAGES/django.po rename to wagtail/core/locale/gl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/he_IL/LC_MESSAGES/django.mo b/wagtail/core/locale/he_IL/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/he_IL/LC_MESSAGES/django.mo rename to wagtail/core/locale/he_IL/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/he_IL/LC_MESSAGES/django.po b/wagtail/core/locale/he_IL/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/he_IL/LC_MESSAGES/django.po rename to wagtail/core/locale/he_IL/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/hu/LC_MESSAGES/django.mo b/wagtail/core/locale/hu/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/hu/LC_MESSAGES/django.mo rename to wagtail/core/locale/hu/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/hu/LC_MESSAGES/django.po b/wagtail/core/locale/hu/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/hu/LC_MESSAGES/django.po rename to wagtail/core/locale/hu/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/id_ID/LC_MESSAGES/django.mo b/wagtail/core/locale/id_ID/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/id_ID/LC_MESSAGES/django.mo rename to wagtail/core/locale/id_ID/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/id_ID/LC_MESSAGES/django.po b/wagtail/core/locale/id_ID/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/id_ID/LC_MESSAGES/django.po rename to wagtail/core/locale/id_ID/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/is_IS/LC_MESSAGES/django.mo b/wagtail/core/locale/is_IS/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/is_IS/LC_MESSAGES/django.mo rename to wagtail/core/locale/is_IS/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/is_IS/LC_MESSAGES/django.po b/wagtail/core/locale/is_IS/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/is_IS/LC_MESSAGES/django.po rename to wagtail/core/locale/is_IS/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/it/LC_MESSAGES/django.mo b/wagtail/core/locale/it/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/it/LC_MESSAGES/django.mo rename to wagtail/core/locale/it/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/it/LC_MESSAGES/django.po b/wagtail/core/locale/it/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/it/LC_MESSAGES/django.po rename to wagtail/core/locale/it/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/ja/LC_MESSAGES/django.mo b/wagtail/core/locale/ja/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/ja/LC_MESSAGES/django.mo rename to wagtail/core/locale/ja/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/ja/LC_MESSAGES/django.po b/wagtail/core/locale/ja/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/ja/LC_MESSAGES/django.po rename to wagtail/core/locale/ja/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/ka/LC_MESSAGES/django.mo b/wagtail/core/locale/ka/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/ka/LC_MESSAGES/django.mo rename to wagtail/core/locale/ka/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/ka/LC_MESSAGES/django.po b/wagtail/core/locale/ka/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/ka/LC_MESSAGES/django.po rename to wagtail/core/locale/ka/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/ko/LC_MESSAGES/django.mo b/wagtail/core/locale/ko/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/ko/LC_MESSAGES/django.mo rename to wagtail/core/locale/ko/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/ko/LC_MESSAGES/django.po b/wagtail/core/locale/ko/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/ko/LC_MESSAGES/django.po rename to wagtail/core/locale/ko/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/lt/LC_MESSAGES/django.mo b/wagtail/core/locale/lt/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/lt/LC_MESSAGES/django.mo rename to wagtail/core/locale/lt/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/lt/LC_MESSAGES/django.po b/wagtail/core/locale/lt/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/lt/LC_MESSAGES/django.po rename to wagtail/core/locale/lt/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/lv/LC_MESSAGES/django.mo b/wagtail/core/locale/lv/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/lv/LC_MESSAGES/django.mo rename to wagtail/core/locale/lv/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/lv/LC_MESSAGES/django.po b/wagtail/core/locale/lv/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/lv/LC_MESSAGES/django.po rename to wagtail/core/locale/lv/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/nb/LC_MESSAGES/django.mo b/wagtail/core/locale/nb/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/nb/LC_MESSAGES/django.mo rename to wagtail/core/locale/nb/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/nb/LC_MESSAGES/django.po b/wagtail/core/locale/nb/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/nb/LC_MESSAGES/django.po rename to wagtail/core/locale/nb/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/nl/LC_MESSAGES/django.mo b/wagtail/core/locale/nl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/nl/LC_MESSAGES/django.mo rename to wagtail/core/locale/nl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/nl/LC_MESSAGES/django.po b/wagtail/core/locale/nl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/nl/LC_MESSAGES/django.po rename to wagtail/core/locale/nl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/nl_NL/LC_MESSAGES/django.mo b/wagtail/core/locale/nl_NL/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/nl_NL/LC_MESSAGES/django.mo rename to wagtail/core/locale/nl_NL/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/nl_NL/LC_MESSAGES/django.po b/wagtail/core/locale/nl_NL/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/nl_NL/LC_MESSAGES/django.po rename to wagtail/core/locale/nl_NL/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/pl/LC_MESSAGES/django.mo b/wagtail/core/locale/pl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/pl/LC_MESSAGES/django.mo rename to wagtail/core/locale/pl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/pl/LC_MESSAGES/django.po b/wagtail/core/locale/pl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/pl/LC_MESSAGES/django.po rename to wagtail/core/locale/pl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/pt_BR/LC_MESSAGES/django.mo b/wagtail/core/locale/pt_BR/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/pt_BR/LC_MESSAGES/django.mo rename to wagtail/core/locale/pt_BR/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/pt_BR/LC_MESSAGES/django.po b/wagtail/core/locale/pt_BR/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/pt_BR/LC_MESSAGES/django.po rename to wagtail/core/locale/pt_BR/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/pt_PT/LC_MESSAGES/django.mo b/wagtail/core/locale/pt_PT/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/pt_PT/LC_MESSAGES/django.mo rename to wagtail/core/locale/pt_PT/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/pt_PT/LC_MESSAGES/django.po b/wagtail/core/locale/pt_PT/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/pt_PT/LC_MESSAGES/django.po rename to wagtail/core/locale/pt_PT/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/ro/LC_MESSAGES/django.mo b/wagtail/core/locale/ro/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/ro/LC_MESSAGES/django.mo rename to wagtail/core/locale/ro/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/ro/LC_MESSAGES/django.po b/wagtail/core/locale/ro/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/ro/LC_MESSAGES/django.po rename to wagtail/core/locale/ro/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/ru/LC_MESSAGES/django.mo b/wagtail/core/locale/ru/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/ru/LC_MESSAGES/django.mo rename to wagtail/core/locale/ru/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/ru/LC_MESSAGES/django.po b/wagtail/core/locale/ru/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/ru/LC_MESSAGES/django.po rename to wagtail/core/locale/ru/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/sk_SK/LC_MESSAGES/django.mo b/wagtail/core/locale/sk_SK/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/sk_SK/LC_MESSAGES/django.mo rename to wagtail/core/locale/sk_SK/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/sk_SK/LC_MESSAGES/django.po b/wagtail/core/locale/sk_SK/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/sk_SK/LC_MESSAGES/django.po rename to wagtail/core/locale/sk_SK/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/sl/LC_MESSAGES/django.mo b/wagtail/core/locale/sl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/sl/LC_MESSAGES/django.mo rename to wagtail/core/locale/sl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/sl/LC_MESSAGES/django.po b/wagtail/core/locale/sl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/sl/LC_MESSAGES/django.po rename to wagtail/core/locale/sl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/sv/LC_MESSAGES/django.mo b/wagtail/core/locale/sv/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/sv/LC_MESSAGES/django.mo rename to wagtail/core/locale/sv/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/sv/LC_MESSAGES/django.po b/wagtail/core/locale/sv/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/sv/LC_MESSAGES/django.po rename to wagtail/core/locale/sv/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/tr/LC_MESSAGES/django.mo b/wagtail/core/locale/tr/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/tr/LC_MESSAGES/django.mo rename to wagtail/core/locale/tr/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/tr/LC_MESSAGES/django.po b/wagtail/core/locale/tr/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/tr/LC_MESSAGES/django.po rename to wagtail/core/locale/tr/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/uk/LC_MESSAGES/django.mo b/wagtail/core/locale/uk/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/uk/LC_MESSAGES/django.mo rename to wagtail/core/locale/uk/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/uk/LC_MESSAGES/django.po b/wagtail/core/locale/uk/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/uk/LC_MESSAGES/django.po rename to wagtail/core/locale/uk/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/zh/LC_MESSAGES/django.mo b/wagtail/core/locale/zh/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/zh/LC_MESSAGES/django.mo rename to wagtail/core/locale/zh/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/zh/LC_MESSAGES/django.po b/wagtail/core/locale/zh/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/zh/LC_MESSAGES/django.po rename to wagtail/core/locale/zh/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/locale/zh_CN/LC_MESSAGES/django.mo b/wagtail/core/locale/zh_CN/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailcore/locale/zh_CN/LC_MESSAGES/django.mo rename to wagtail/core/locale/zh_CN/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailcore/locale/zh_CN/LC_MESSAGES/django.po b/wagtail/core/locale/zh_CN/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailcore/locale/zh_CN/LC_MESSAGES/django.po rename to wagtail/core/locale/zh_CN/LC_MESSAGES/django.po diff --git a/wagtail/wagtailcore/management/__init__.py b/wagtail/core/management/__init__.py similarity index 100% rename from wagtail/wagtailcore/management/__init__.py rename to wagtail/core/management/__init__.py diff --git a/wagtail/wagtailcore/management/commands/__init__.py b/wagtail/core/management/commands/__init__.py similarity index 100% rename from wagtail/wagtailcore/management/commands/__init__.py rename to wagtail/core/management/commands/__init__.py diff --git a/wagtail/wagtailcore/management/commands/fixtree.py b/wagtail/core/management/commands/fixtree.py similarity index 99% rename from wagtail/wagtailcore/management/commands/fixtree.py rename to wagtail/core/management/commands/fixtree.py index 3dfbfec21..e86904c69 100644 --- a/wagtail/wagtailcore/management/commands/fixtree.py +++ b/wagtail/core/management/commands/fixtree.py @@ -7,7 +7,7 @@ from django.core.management.base import BaseCommand from django.db import models from django.db.models import Q -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page class Command(BaseCommand): diff --git a/wagtail/wagtailcore/management/commands/move_pages.py b/wagtail/core/management/commands/move_pages.py similarity index 94% rename from wagtail/wagtailcore/management/commands/move_pages.py rename to wagtail/core/management/commands/move_pages.py index 05bd9ed15..101baf893 100644 --- a/wagtail/wagtailcore/management/commands/move_pages.py +++ b/wagtail/core/management/commands/move_pages.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.core.management.base import BaseCommand -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page class Command(BaseCommand): diff --git a/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py b/wagtail/core/management/commands/publish_scheduled_pages.py similarity index 98% rename from wagtail/wagtailcore/management/commands/publish_scheduled_pages.py rename to wagtail/core/management/commands/publish_scheduled_pages.py index 88b2f8291..7c29e4808 100644 --- a/wagtail/wagtailcore/management/commands/publish_scheduled_pages.py +++ b/wagtail/core/management/commands/publish_scheduled_pages.py @@ -5,7 +5,7 @@ import json from django.core.management.base import BaseCommand from django.utils import dateparse, timezone -from wagtail.wagtailcore.models import Page, PageRevision +from wagtail.core.models import Page, PageRevision def revision_date_expired(r): diff --git a/wagtail/wagtailcore/management/commands/replace_text.py b/wagtail/core/management/commands/replace_text.py similarity index 96% rename from wagtail/wagtailcore/management/commands/replace_text.py rename to wagtail/core/management/commands/replace_text.py index 7d7ac53d1..dd08992c7 100644 --- a/wagtail/wagtailcore/management/commands/replace_text.py +++ b/wagtail/core/management/commands/replace_text.py @@ -4,7 +4,7 @@ from django.core.management.base import BaseCommand from django.db import models from modelcluster.models import get_all_child_relations -from wagtail.wagtailcore.models import PageRevision, get_page_models +from wagtail.core.models import PageRevision, get_page_models def replace_in_model(model, from_text, to_text): diff --git a/wagtail/wagtailcore/management/commands/set_url_paths.py b/wagtail/core/management/commands/set_url_paths.py similarity index 92% rename from wagtail/wagtailcore/management/commands/set_url_paths.py rename to wagtail/core/management/commands/set_url_paths.py index 0a3c28c19..bb92d12c1 100644 --- a/wagtail/wagtailcore/management/commands/set_url_paths.py +++ b/wagtail/core/management/commands/set_url_paths.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.core.management.base import BaseCommand -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page class Command(BaseCommand): diff --git a/wagtail/wagtailcore/middleware.py b/wagtail/core/middleware.py similarity index 91% rename from wagtail/wagtailcore/middleware.py rename to wagtail/core/middleware.py index 23a45a443..e899ed305 100644 --- a/wagtail/wagtailcore/middleware.py +++ b/wagtail/core/middleware.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.deprecation import MiddlewareMixin -from wagtail.wagtailcore.models import Site +from wagtail.core.models import Site class SiteMiddleware(MiddlewareMixin): diff --git a/wagtail/wagtailcore/migrations/0001_initial.py b/wagtail/core/migrations/0001_initial.py similarity index 100% rename from wagtail/wagtailcore/migrations/0001_initial.py rename to wagtail/core/migrations/0001_initial.py diff --git a/wagtail/wagtailcore/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 similarity index 100% rename from wagtail/wagtailcore/migrations/0001_squashed_0016_change_page_url_path_to_text_field.py rename to wagtail/core/migrations/0001_squashed_0016_change_page_url_path_to_text_field.py diff --git a/wagtail/wagtailcore/migrations/0002_initial_data.py b/wagtail/core/migrations/0002_initial_data.py similarity index 100% rename from wagtail/wagtailcore/migrations/0002_initial_data.py rename to wagtail/core/migrations/0002_initial_data.py diff --git a/wagtail/wagtailcore/migrations/0003_add_uniqueness_constraint_on_group_page_permission.py b/wagtail/core/migrations/0003_add_uniqueness_constraint_on_group_page_permission.py similarity index 100% rename from wagtail/wagtailcore/migrations/0003_add_uniqueness_constraint_on_group_page_permission.py rename to wagtail/core/migrations/0003_add_uniqueness_constraint_on_group_page_permission.py diff --git a/wagtail/wagtailcore/migrations/0004_page_locked.py b/wagtail/core/migrations/0004_page_locked.py similarity index 100% rename from wagtail/wagtailcore/migrations/0004_page_locked.py rename to wagtail/core/migrations/0004_page_locked.py diff --git a/wagtail/wagtailcore/migrations/0005_add_page_lock_permission_to_moderators.py b/wagtail/core/migrations/0005_add_page_lock_permission_to_moderators.py similarity index 100% rename from wagtail/wagtailcore/migrations/0005_add_page_lock_permission_to_moderators.py rename to wagtail/core/migrations/0005_add_page_lock_permission_to_moderators.py diff --git a/wagtail/wagtailcore/migrations/0006_add_lock_page_permission.py b/wagtail/core/migrations/0006_add_lock_page_permission.py similarity index 100% rename from wagtail/wagtailcore/migrations/0006_add_lock_page_permission.py rename to wagtail/core/migrations/0006_add_lock_page_permission.py diff --git a/wagtail/wagtailcore/migrations/0007_page_latest_revision_created_at.py b/wagtail/core/migrations/0007_page_latest_revision_created_at.py similarity index 100% rename from wagtail/wagtailcore/migrations/0007_page_latest_revision_created_at.py rename to wagtail/core/migrations/0007_page_latest_revision_created_at.py diff --git a/wagtail/wagtailcore/migrations/0008_populate_latest_revision_created_at.py b/wagtail/core/migrations/0008_populate_latest_revision_created_at.py similarity index 100% rename from wagtail/wagtailcore/migrations/0008_populate_latest_revision_created_at.py rename to wagtail/core/migrations/0008_populate_latest_revision_created_at.py diff --git a/wagtail/wagtailcore/migrations/0009_remove_auto_now_add_from_pagerevision_created_at.py b/wagtail/core/migrations/0009_remove_auto_now_add_from_pagerevision_created_at.py similarity index 100% rename from wagtail/wagtailcore/migrations/0009_remove_auto_now_add_from_pagerevision_created_at.py rename to wagtail/core/migrations/0009_remove_auto_now_add_from_pagerevision_created_at.py diff --git a/wagtail/wagtailcore/migrations/0010_change_page_owner_to_null_on_delete.py b/wagtail/core/migrations/0010_change_page_owner_to_null_on_delete.py similarity index 100% rename from wagtail/wagtailcore/migrations/0010_change_page_owner_to_null_on_delete.py rename to wagtail/core/migrations/0010_change_page_owner_to_null_on_delete.py diff --git a/wagtail/wagtailcore/migrations/0011_page_first_published_at.py b/wagtail/core/migrations/0011_page_first_published_at.py similarity index 100% rename from wagtail/wagtailcore/migrations/0011_page_first_published_at.py rename to wagtail/core/migrations/0011_page_first_published_at.py diff --git a/wagtail/wagtailcore/migrations/0012_extend_page_slug_field.py b/wagtail/core/migrations/0012_extend_page_slug_field.py similarity index 100% rename from wagtail/wagtailcore/migrations/0012_extend_page_slug_field.py rename to wagtail/core/migrations/0012_extend_page_slug_field.py diff --git a/wagtail/wagtailcore/migrations/0013_update_golive_expire_help_text.py b/wagtail/core/migrations/0013_update_golive_expire_help_text.py similarity index 100% rename from wagtail/wagtailcore/migrations/0013_update_golive_expire_help_text.py rename to wagtail/core/migrations/0013_update_golive_expire_help_text.py diff --git a/wagtail/wagtailcore/migrations/0014_add_verbose_name.py b/wagtail/core/migrations/0014_add_verbose_name.py similarity index 100% rename from wagtail/wagtailcore/migrations/0014_add_verbose_name.py rename to wagtail/core/migrations/0014_add_verbose_name.py diff --git a/wagtail/wagtailcore/migrations/0015_add_more_verbose_names.py b/wagtail/core/migrations/0015_add_more_verbose_names.py similarity index 100% rename from wagtail/wagtailcore/migrations/0015_add_more_verbose_names.py rename to wagtail/core/migrations/0015_add_more_verbose_names.py diff --git a/wagtail/wagtailcore/migrations/0016_change_page_url_path_to_text_field.py b/wagtail/core/migrations/0016_change_page_url_path_to_text_field.py similarity index 100% rename from wagtail/wagtailcore/migrations/0016_change_page_url_path_to_text_field.py rename to wagtail/core/migrations/0016_change_page_url_path_to_text_field.py diff --git a/wagtail/wagtailcore/migrations/0017_change_edit_page_permission_description.py b/wagtail/core/migrations/0017_change_edit_page_permission_description.py similarity index 100% rename from wagtail/wagtailcore/migrations/0017_change_edit_page_permission_description.py rename to wagtail/core/migrations/0017_change_edit_page_permission_description.py diff --git a/wagtail/wagtailcore/migrations/0018_pagerevision_submitted_for_moderation_index.py b/wagtail/core/migrations/0018_pagerevision_submitted_for_moderation_index.py similarity index 100% rename from wagtail/wagtailcore/migrations/0018_pagerevision_submitted_for_moderation_index.py rename to wagtail/core/migrations/0018_pagerevision_submitted_for_moderation_index.py diff --git a/wagtail/wagtailcore/migrations/0019_verbose_names_cleanup.py b/wagtail/core/migrations/0019_verbose_names_cleanup.py similarity index 100% rename from wagtail/wagtailcore/migrations/0019_verbose_names_cleanup.py rename to wagtail/core/migrations/0019_verbose_names_cleanup.py diff --git a/wagtail/wagtailcore/migrations/0020_add_index_on_page_first_published_at.py b/wagtail/core/migrations/0020_add_index_on_page_first_published_at.py similarity index 100% rename from wagtail/wagtailcore/migrations/0020_add_index_on_page_first_published_at.py rename to wagtail/core/migrations/0020_add_index_on_page_first_published_at.py diff --git a/wagtail/wagtailcore/migrations/0021_capitalizeverbose.py b/wagtail/core/migrations/0021_capitalizeverbose.py similarity index 100% rename from wagtail/wagtailcore/migrations/0021_capitalizeverbose.py rename to wagtail/core/migrations/0021_capitalizeverbose.py diff --git a/wagtail/wagtailcore/migrations/0022_add_site_name.py b/wagtail/core/migrations/0022_add_site_name.py similarity index 100% rename from wagtail/wagtailcore/migrations/0022_add_site_name.py rename to wagtail/core/migrations/0022_add_site_name.py diff --git a/wagtail/wagtailcore/migrations/0023_alter_page_revision_on_delete_behaviour.py b/wagtail/core/migrations/0023_alter_page_revision_on_delete_behaviour.py similarity index 100% rename from wagtail/wagtailcore/migrations/0023_alter_page_revision_on_delete_behaviour.py rename to wagtail/core/migrations/0023_alter_page_revision_on_delete_behaviour.py diff --git a/wagtail/wagtailcore/migrations/0024_alter_page_content_type_on_delete_behaviour.py b/wagtail/core/migrations/0024_alter_page_content_type_on_delete_behaviour.py similarity index 74% rename from wagtail/wagtailcore/migrations/0024_alter_page_content_type_on_delete_behaviour.py rename to wagtail/core/migrations/0024_alter_page_content_type_on_delete_behaviour.py index 5c55f2dad..7d644384a 100644 --- a/wagtail/wagtailcore/migrations/0024_alter_page_content_type_on_delete_behaviour.py +++ b/wagtail/core/migrations/0024_alter_page_content_type_on_delete_behaviour.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from django.db import migrations, models -import wagtail.wagtailcore.models +import wagtail.core.models class Migration(migrations.Migration): @@ -17,6 +17,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='page', name='content_type', - field=models.ForeignKey(on_delete=models.SET(wagtail.wagtailcore.models.get_default_page_content_type), related_name='pages', to='contenttypes.ContentType', verbose_name='content type'), + field=models.ForeignKey(on_delete=models.SET(wagtail.core.models.get_default_page_content_type), related_name='pages', to='contenttypes.ContentType', verbose_name='content type'), ), ] diff --git a/wagtail/wagtailcore/migrations/0024_collection.py b/wagtail/core/migrations/0024_collection.py similarity index 100% rename from wagtail/wagtailcore/migrations/0024_collection.py rename to wagtail/core/migrations/0024_collection.py diff --git a/wagtail/wagtailcore/migrations/0025_collection_initial_data.py b/wagtail/core/migrations/0025_collection_initial_data.py similarity index 100% rename from wagtail/wagtailcore/migrations/0025_collection_initial_data.py rename to wagtail/core/migrations/0025_collection_initial_data.py diff --git a/wagtail/wagtailcore/migrations/0026_group_collection_permission.py b/wagtail/core/migrations/0026_group_collection_permission.py similarity index 100% rename from wagtail/wagtailcore/migrations/0026_group_collection_permission.py rename to wagtail/core/migrations/0026_group_collection_permission.py diff --git a/wagtail/wagtailcore/migrations/0027_fix_collection_path_collation.py b/wagtail/core/migrations/0027_fix_collection_path_collation.py similarity index 100% rename from wagtail/wagtailcore/migrations/0027_fix_collection_path_collation.py rename to wagtail/core/migrations/0027_fix_collection_path_collation.py diff --git a/wagtail/wagtailcore/migrations/0028_merge.py b/wagtail/core/migrations/0028_merge.py similarity index 100% rename from wagtail/wagtailcore/migrations/0028_merge.py rename to wagtail/core/migrations/0028_merge.py diff --git a/wagtail/wagtailcore/migrations/0029_unicode_slugfield_dj19.py b/wagtail/core/migrations/0029_unicode_slugfield_dj19.py similarity index 100% rename from wagtail/wagtailcore/migrations/0029_unicode_slugfield_dj19.py rename to wagtail/core/migrations/0029_unicode_slugfield_dj19.py diff --git a/wagtail/wagtailcore/migrations/0030_index_on_pagerevision_created_at.py b/wagtail/core/migrations/0030_index_on_pagerevision_created_at.py similarity index 100% rename from wagtail/wagtailcore/migrations/0030_index_on_pagerevision_created_at.py rename to wagtail/core/migrations/0030_index_on_pagerevision_created_at.py diff --git a/wagtail/wagtailcore/migrations/0031_add_page_view_restriction_types.py b/wagtail/core/migrations/0031_add_page_view_restriction_types.py similarity index 100% rename from wagtail/wagtailcore/migrations/0031_add_page_view_restriction_types.py rename to wagtail/core/migrations/0031_add_page_view_restriction_types.py diff --git a/wagtail/wagtailcore/migrations/0032_add_bulk_delete_page_permission.py b/wagtail/core/migrations/0032_add_bulk_delete_page_permission.py similarity index 100% rename from wagtail/wagtailcore/migrations/0032_add_bulk_delete_page_permission.py rename to wagtail/core/migrations/0032_add_bulk_delete_page_permission.py diff --git a/wagtail/wagtailcore/migrations/0033_remove_golive_expiry_help_text.py b/wagtail/core/migrations/0033_remove_golive_expiry_help_text.py similarity index 100% rename from wagtail/wagtailcore/migrations/0033_remove_golive_expiry_help_text.py rename to wagtail/core/migrations/0033_remove_golive_expiry_help_text.py diff --git a/wagtail/wagtailcore/migrations/0034_page_live_revision.py b/wagtail/core/migrations/0034_page_live_revision.py similarity index 100% rename from wagtail/wagtailcore/migrations/0034_page_live_revision.py rename to wagtail/core/migrations/0034_page_live_revision.py diff --git a/wagtail/wagtailcore/migrations/0035_page_last_published_at.py b/wagtail/core/migrations/0035_page_last_published_at.py similarity index 100% rename from wagtail/wagtailcore/migrations/0035_page_last_published_at.py rename to wagtail/core/migrations/0035_page_last_published_at.py diff --git a/wagtail/wagtailcore/migrations/0036_populate_page_last_published_at.py b/wagtail/core/migrations/0036_populate_page_last_published_at.py similarity index 100% rename from wagtail/wagtailcore/migrations/0036_populate_page_last_published_at.py rename to wagtail/core/migrations/0036_populate_page_last_published_at.py diff --git a/wagtail/wagtailcore/migrations/0037_set_page_owner_editable.py b/wagtail/core/migrations/0037_set_page_owner_editable.py similarity index 100% rename from wagtail/wagtailcore/migrations/0037_set_page_owner_editable.py rename to wagtail/core/migrations/0037_set_page_owner_editable.py diff --git a/wagtail/wagtailcore/migrations/0038_make_first_published_at_editable.py b/wagtail/core/migrations/0038_make_first_published_at_editable.py similarity index 100% rename from wagtail/wagtailcore/migrations/0038_make_first_published_at_editable.py rename to wagtail/core/migrations/0038_make_first_published_at_editable.py diff --git a/wagtail/wagtailcore/migrations/0039_collectionviewrestriction.py b/wagtail/core/migrations/0039_collectionviewrestriction.py similarity index 100% rename from wagtail/wagtailcore/migrations/0039_collectionviewrestriction.py rename to wagtail/core/migrations/0039_collectionviewrestriction.py diff --git a/wagtail/wagtailcore/migrations/0040_page_draft_title.py b/wagtail/core/migrations/0040_page_draft_title.py similarity index 100% rename from wagtail/wagtailcore/migrations/0040_page_draft_title.py rename to wagtail/core/migrations/0040_page_draft_title.py diff --git a/wagtail/wagtailcore/migrations/__init__.py b/wagtail/core/migrations/__init__.py similarity index 100% rename from wagtail/wagtailcore/migrations/__init__.py rename to wagtail/core/migrations/__init__.py diff --git a/wagtail/wagtailcore/models.py b/wagtail/core/models.py similarity index 99% rename from wagtail/wagtailcore/models.py rename to wagtail/core/models.py index 84688cd5d..6068f2304 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/core/models.py @@ -28,11 +28,11 @@ from django.utils.translation import ugettext_lazy as _ from modelcluster.models import ClusterableModel, get_all_child_relations from treebeard.mp_tree import MP_Node -from wagtail.wagtailcore.query import PageQuerySet, TreeQuerySet -from wagtail.wagtailcore.signals import page_published, page_unpublished -from wagtail.wagtailcore.sites import get_site_for_hostname -from wagtail.wagtailcore.url_routing import RouteResult -from wagtail.wagtailcore.utils import ( +from wagtail.core.query import PageQuerySet, TreeQuerySet +from wagtail.core.signals import page_published, page_unpublished +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 @@ -527,7 +527,7 @@ class Page(six.with_metaclass(PageBase, AbstractPage, index.Indexed, Clusterable errors.append( checks.Error( "Manager does not inherit from PageManager", - hint="Ensure that custom Page managers inherit from wagtail.wagtailcore.models.PageManager", + hint="Ensure that custom Page managers inherit from wagtail.core.models.PageManager", obj=cls, id='wagtailcore.E002', ) diff --git a/wagtail/wagtailcore/permission_policies/__init__.py b/wagtail/core/permission_policies/__init__.py similarity index 100% rename from wagtail/wagtailcore/permission_policies/__init__.py rename to wagtail/core/permission_policies/__init__.py diff --git a/wagtail/wagtailcore/permission_policies/base.py b/wagtail/core/permission_policies/base.py similarity index 100% rename from wagtail/wagtailcore/permission_policies/base.py rename to wagtail/core/permission_policies/base.py diff --git a/wagtail/wagtailcore/permission_policies/collections.py b/wagtail/core/permission_policies/collections.py similarity index 99% rename from wagtail/wagtailcore/permission_policies/collections.py rename to wagtail/core/permission_policies/collections.py index e9c397330..f0590b827 100644 --- a/wagtail/wagtailcore/permission_policies/collections.py +++ b/wagtail/core/permission_policies/collections.py @@ -5,7 +5,7 @@ from django.contrib.auth.models import Group, Permission from django.core.exceptions import FieldDoesNotExist, ImproperlyConfigured from django.db.models import Q -from wagtail.wagtailcore.models import Collection, GroupCollectionPermission +from wagtail.core.models import Collection, GroupCollectionPermission from .base import BaseDjangoAuthPermissionPolicy diff --git a/wagtail/wagtailcore/permissions.py b/wagtail/core/permissions.py similarity index 57% rename from wagtail/wagtailcore/permissions.py rename to wagtail/core/permissions.py index d94dd9ae5..7af41f4c6 100644 --- a/wagtail/wagtailcore/permissions.py +++ b/wagtail/core/permissions.py @@ -1,7 +1,7 @@ from __future__ import absolute_import, unicode_literals -from wagtail.wagtailcore.models import Collection, Site -from wagtail.wagtailcore.permission_policies import ModelPermissionPolicy +from wagtail.core.models import Collection, Site +from wagtail.core.permission_policies import ModelPermissionPolicy site_permission_policy = ModelPermissionPolicy(Site) collection_permission_policy = ModelPermissionPolicy(Collection) diff --git a/wagtail/wagtailcore/query.py b/wagtail/core/query.py similarity index 99% rename from wagtail/wagtailcore/query.py rename to wagtail/core/query.py index 1ac7d8df7..4431dba93 100644 --- a/wagtail/wagtailcore/query.py +++ b/wagtail/core/query.py @@ -213,7 +213,7 @@ class PageQuerySet(SearchableQuerySetMixin, TreeQuerySet): return self.exclude(self.exact_type_q(model)) def public_q(self): - from wagtail.wagtailcore.models import PageViewRestriction + from wagtail.core.models import PageViewRestriction q = Q() for restriction in PageViewRestriction.objects.all(): diff --git a/wagtail/wagtailcore/rich_text.py b/wagtail/core/rich_text.py similarity index 98% rename from wagtail/wagtailcore/rich_text.py rename to wagtail/core/rich_text.py index 333c37dc5..65c95745b 100644 --- a/wagtail/wagtailcore/rich_text.py +++ b/wagtail/core/rich_text.py @@ -5,9 +5,9 @@ import re # parsing HTML with regexes LIKE A BOSS. from django.utils.html import escape from django.utils.safestring import mark_safe -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Page -from wagtail.wagtailcore.whitelist import Whitelister +from wagtail.core import hooks +from wagtail.core.models import Page +from wagtail.core.whitelist import Whitelister # Define a set of 'embed handlers' and 'link handlers'. These handle the translation diff --git a/wagtail/wagtailcore/signal_handlers.py b/wagtail/core/signal_handlers.py similarity index 96% rename from wagtail/wagtailcore/signal_handlers.py rename to wagtail/core/signal_handlers.py index 80cf69e87..dc187b135 100644 --- a/wagtail/wagtailcore/signal_handlers.py +++ b/wagtail/core/signal_handlers.py @@ -5,7 +5,7 @@ import logging from django.core.cache import cache from django.db.models.signals import post_delete, post_save, pre_delete -from wagtail.wagtailcore.models import Page, Site +from wagtail.core.models import Page, Site logger = logging.getLogger('wagtail.core') diff --git a/wagtail/wagtailcore/signals.py b/wagtail/core/signals.py similarity index 100% rename from wagtail/wagtailcore/signals.py rename to wagtail/core/signals.py diff --git a/wagtail/wagtailcore/sites.py b/wagtail/core/sites.py similarity index 100% rename from wagtail/wagtailcore/sites.py rename to wagtail/core/sites.py diff --git a/wagtail/wagtailcore/templates/wagtailcore/login.html b/wagtail/core/templates/wagtailcore/login.html similarity index 100% rename from wagtail/wagtailcore/templates/wagtailcore/login.html rename to wagtail/core/templates/wagtailcore/login.html diff --git a/wagtail/wagtailcore/templates/wagtailcore/page.html b/wagtail/core/templates/wagtailcore/page.html similarity index 100% rename from wagtail/wagtailcore/templates/wagtailcore/page.html rename to wagtail/core/templates/wagtailcore/page.html diff --git a/wagtail/wagtailcore/templates/wagtailcore/password_required.html b/wagtail/core/templates/wagtailcore/password_required.html similarity index 100% rename from wagtail/wagtailcore/templates/wagtailcore/password_required.html rename to wagtail/core/templates/wagtailcore/password_required.html diff --git a/wagtail/wagtailcore/templatetags/__init__.py b/wagtail/core/templatetags/__init__.py similarity index 100% rename from wagtail/wagtailcore/templatetags/__init__.py rename to wagtail/core/templatetags/__init__.py diff --git a/wagtail/wagtailcore/templatetags/wagtailcore_tags.py b/wagtail/core/templatetags/wagtailcore_tags.py similarity index 97% rename from wagtail/wagtailcore/templatetags/wagtailcore_tags.py rename to wagtail/core/templatetags/wagtailcore_tags.py index 5eee06f28..45de60522 100644 --- a/wagtail/wagtailcore/templatetags/wagtailcore_tags.py +++ b/wagtail/core/templatetags/wagtailcore_tags.py @@ -6,8 +6,8 @@ from django.utils.encoding import force_text from django.utils.safestring import mark_safe from wagtail import __version__ -from wagtail.wagtailcore.models import Page -from wagtail.wagtailcore.rich_text import RichText, expand_db_html +from wagtail.core.models import Page +from wagtail.core.rich_text import RichText, expand_db_html register = template.Library() diff --git a/wagtail/wagtailcore/tests/__init__.py b/wagtail/core/tests/__init__.py similarity index 100% rename from wagtail/wagtailcore/tests/__init__.py rename to wagtail/core/tests/__init__.py diff --git a/wagtail/wagtailcore/tests/test_blocks.py b/wagtail/core/tests/test_blocks.py similarity index 99% rename from wagtail/wagtailcore/tests/test_blocks.py rename to wagtail/core/tests/test_blocks.py index 6a4326c96..16dcb65eb 100644 --- a/wagtail/wagtailcore/tests/test_blocks.py +++ b/wagtail/core/tests/test_blocks.py @@ -22,9 +22,9 @@ from wagtail.tests.testapp.blocks import LinkBlock as CustomLinkBlock from wagtail.tests.testapp.blocks import SectionBlock from wagtail.tests.testapp.models import EventPage, SimplePage from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore import blocks -from wagtail.wagtailcore.models import Page -from wagtail.wagtailcore.rich_text import RichText +from wagtail.core import blocks +from wagtail.core.models import Page +from wagtail.core.rich_text import RichText class FooStreamBlock(blocks.StreamBlock): @@ -653,7 +653,7 @@ class TestChoiceBlock(WagtailTestUtils, SimpleTestCase): self.assertEqual( block.deconstruct(), ( - 'wagtail.wagtailcore.blocks.ChoiceBlock', + 'wagtail.core.blocks.ChoiceBlock', [], { 'choices': [('tea', 'Tea'), ('coffee', 'Coffee')], @@ -746,7 +746,7 @@ class TestChoiceBlock(WagtailTestUtils, SimpleTestCase): self.assertEqual( block.deconstruct(), ( - 'wagtail.wagtailcore.blocks.ChoiceBlock', + 'wagtail.core.blocks.ChoiceBlock', [], { 'choices': callable_choices, @@ -1337,7 +1337,7 @@ class TestStructBlock(SimpleTestCase): result = str(value) self.assertNotIn('

', result) # The expected rendering should correspond to the native representation of an OrderedDict: - # "StructValue([('title', u'Hello'), ('body', )])" + # "StructValue([('title', u'Hello'), ('body', )])" # - give or take some quoting differences between Python versions self.assertIn('StructValue', result) self.assertIn('title', result) @@ -2594,31 +2594,31 @@ class TestPageChooserBlock(TestCase): def test_deconstruct_target_model_default(self): block = blocks.PageChooserBlock() self.assertEqual(block.deconstruct(), ( - 'wagtail.wagtailcore.blocks.PageChooserBlock', + 'wagtail.core.blocks.PageChooserBlock', (), {})) def test_deconstruct_target_model_string(self): block = blocks.PageChooserBlock(target_model='tests.SimplePage') self.assertEqual(block.deconstruct(), ( - 'wagtail.wagtailcore.blocks.PageChooserBlock', + 'wagtail.core.blocks.PageChooserBlock', (), {'target_model': ['tests.SimplePage']})) def test_deconstruct_target_model_literal(self): block = blocks.PageChooserBlock(target_model=SimplePage) self.assertEqual(block.deconstruct(), ( - 'wagtail.wagtailcore.blocks.PageChooserBlock', + 'wagtail.core.blocks.PageChooserBlock', (), {'target_model': ['tests.SimplePage']})) def test_deconstruct_target_model_multiple_strings(self): block = blocks.PageChooserBlock(target_model=['tests.SimplePage', 'tests.EventPage']) self.assertEqual(block.deconstruct(), ( - 'wagtail.wagtailcore.blocks.PageChooserBlock', + 'wagtail.core.blocks.PageChooserBlock', (), {'target_model': ['tests.SimplePage', 'tests.EventPage']})) def test_deconstruct_target_model_multiple_literals(self): block = blocks.PageChooserBlock(target_model=[SimplePage, EventPage]) self.assertEqual(block.deconstruct(), ( - 'wagtail.wagtailcore.blocks.PageChooserBlock', + 'wagtail.core.blocks.PageChooserBlock', (), {'target_model': ['tests.SimplePage', 'tests.EventPage']})) diff --git a/wagtail/wagtailcore/tests/test_collection_model.py b/wagtail/core/tests/test_collection_model.py similarity index 98% rename from wagtail/wagtailcore/tests/test_collection_model.py rename to wagtail/core/tests/test_collection_model.py index eb591907b..b0e6bcbd6 100644 --- a/wagtail/wagtailcore/tests/test_collection_model.py +++ b/wagtail/core/tests/test_collection_model.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.test import TestCase -from wagtail.wagtailcore.models import Collection +from wagtail.core.models import Collection class TestCollectionTreeOperations(TestCase): diff --git a/wagtail/wagtailcore/tests/test_collection_permission_policies.py b/wagtail/core/tests/test_collection_permission_policies.py similarity index 99% rename from wagtail/wagtailcore/tests/test_collection_permission_policies.py rename to wagtail/core/tests/test_collection_permission_policies.py index 20db54bd2..8feff3b49 100644 --- a/wagtail/wagtailcore/tests/test_collection_permission_policies.py +++ b/wagtail/core/tests/test_collection_permission_policies.py @@ -5,10 +5,10 @@ from django.contrib.auth.models import AnonymousUser, Group, Permission from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from wagtail.wagtailcore.models import Collection, GroupCollectionPermission -from wagtail.wagtailcore.permission_policies.collections import ( +from wagtail.core.models import Collection, GroupCollectionPermission +from wagtail.core.permission_policies.collections import ( CollectionOwnershipPermissionPolicy, CollectionPermissionPolicy) -from wagtail.wagtailcore.tests.test_permission_policies import PermissionPolicyTestUtils +from wagtail.core.tests.test_permission_policies import PermissionPolicyTestUtils from wagtail.wagtaildocs.models import Document diff --git a/wagtail/wagtailcore/tests/test_dbwhitelister.py b/wagtail/core/tests/test_dbwhitelister.py similarity index 97% rename from wagtail/wagtailcore/tests/test_dbwhitelister.py rename to wagtail/core/tests/test_dbwhitelister.py index 2ada14609..34b2236bd 100644 --- a/wagtail/wagtailcore/tests/test_dbwhitelister.py +++ b/wagtail/core/tests/test_dbwhitelister.py @@ -3,8 +3,8 @@ from __future__ import absolute_import, unicode_literals from bs4 import BeautifulSoup from django.test import TestCase -from wagtail.wagtailcore.rich_text import DbWhitelister -from wagtail.wagtailcore.whitelist import Whitelister +from wagtail.core.rich_text import DbWhitelister +from wagtail.core.whitelist import Whitelister class TestDbWhitelister(TestCase): diff --git a/wagtail/wagtailcore/tests/test_hooks.py b/wagtail/core/tests/test_hooks.py similarity index 96% rename from wagtail/wagtailcore/tests/test_hooks.py rename to wagtail/core/tests/test_hooks.py index e42202ddc..94b84ddba 100644 --- a/wagtail/wagtailcore/tests/test_hooks.py +++ b/wagtail/core/tests/test_hooks.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.test import TestCase from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore import hooks +from wagtail.core import hooks def test_hook(): diff --git a/wagtail/wagtailcore/tests/test_jinja2.py b/wagtail/core/tests/test_jinja2.py similarity index 98% rename from wagtail/wagtailcore/tests/test_jinja2.py rename to wagtail/core/tests/test_jinja2.py index 30cca2f1c..2ac6c8536 100644 --- a/wagtail/wagtailcore/tests/test_jinja2.py +++ b/wagtail/core/tests/test_jinja2.py @@ -6,8 +6,8 @@ from django.test import TestCase from wagtail import __version__ from wagtail.tests.testapp.blocks import SectionBlock -from wagtail.wagtailcore import blocks -from wagtail.wagtailcore.models import Page, Site +from wagtail.core import blocks +from wagtail.core.models import Page, Site class TestCoreGlobalsAndFilters(TestCase): diff --git a/wagtail/wagtailcore/tests/test_management_commands.py b/wagtail/core/tests/test_management_commands.py similarity index 98% rename from wagtail/wagtailcore/tests/test_management_commands.py rename to wagtail/core/tests/test_management_commands.py index fe83e9ee0..b75429de9 100644 --- a/wagtail/wagtailcore/tests/test_management_commands.py +++ b/wagtail/core/tests/test_management_commands.py @@ -9,8 +9,8 @@ from django.test import TestCase from django.utils import timezone from wagtail.tests.testapp.models import EventPage, SimplePage -from wagtail.wagtailcore.models import Page, PageRevision -from wagtail.wagtailcore.signals import page_published, page_unpublished +from wagtail.core.models import Page, PageRevision +from wagtail.core.signals import page_published, page_unpublished class TestFixTreeCommand(TestCase): diff --git a/wagtail/wagtailcore/tests/test_migrations.py b/wagtail/core/tests/test_migrations.py similarity index 100% rename from wagtail/wagtailcore/tests/test_migrations.py rename to wagtail/core/tests/test_migrations.py diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/core/tests/test_page_model.py similarity index 99% rename from wagtail/wagtailcore/tests/test_page_model.py rename to wagtail/core/tests/test_page_model.py index b1737e4f8..fa93e678a 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/core/tests/test_page_model.py @@ -22,7 +22,7 @@ from wagtail.tests.testapp.models import ( PageWithExcludedCopyField, SimplePage, SingleEventPage, SingletonPage, StandardIndex, TaggedPage) from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore.models import Page, PageManager, Site, get_page_models +from wagtail.core.models import Page, PageManager, Site, get_page_models def get_ct(model): diff --git a/wagtail/wagtailcore/tests/test_page_permissions.py b/wagtail/core/tests/test_page_permissions.py similarity index 99% rename from wagtail/wagtailcore/tests/test_page_permissions.py rename to wagtail/core/tests/test_page_permissions.py index 3a084b63f..f011c101c 100644 --- a/wagtail/wagtailcore/tests/test_page_permissions.py +++ b/wagtail/core/tests/test_page_permissions.py @@ -5,7 +5,7 @@ from django.contrib.auth.models import Group from django.test import TestCase from wagtail.tests.testapp.models import BusinessSubIndex, EventIndex, EventPage -from wagtail.wagtailcore.models import GroupPagePermission, Page, UserPagePermissionsProxy +from wagtail.core.models import GroupPagePermission, Page, UserPagePermissionsProxy class TestPagePermission(TestCase): diff --git a/wagtail/wagtailcore/tests/test_page_privacy.py b/wagtail/core/tests/test_page_privacy.py similarity index 98% rename from wagtail/wagtailcore/tests/test_page_privacy.py rename to wagtail/core/tests/test_page_privacy.py index 71f04818b..1b5403922 100644 --- a/wagtail/wagtailcore/tests/test_page_privacy.py +++ b/wagtail/core/tests/test_page_privacy.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.contrib.auth.models import Group from django.test import TestCase -from wagtail.wagtailcore.models import Page, PageViewRestriction +from wagtail.core.models import Page, PageViewRestriction class TestPagePrivacy(TestCase): diff --git a/wagtail/wagtailcore/tests/test_page_queryset.py b/wagtail/core/tests/test_page_queryset.py similarity index 99% rename from wagtail/wagtailcore/tests/test_page_queryset.py rename to wagtail/core/tests/test_page_queryset.py index bbbb47c46..002a46898 100644 --- a/wagtail/wagtailcore/tests/test_page_queryset.py +++ b/wagtail/core/tests/test_page_queryset.py @@ -4,8 +4,8 @@ from django.contrib.contenttypes.models import ContentType from django.test import TestCase from wagtail.tests.testapp.models import EventPage, SimplePage, SingleEventPage -from wagtail.wagtailcore.models import Page, PageViewRestriction, Site -from wagtail.wagtailcore.signals import page_unpublished +from wagtail.core.models import Page, PageViewRestriction, Site +from wagtail.core.signals import page_unpublished class TestPageQuerySet(TestCase): diff --git a/wagtail/wagtailcore/tests/test_permission_policies.py b/wagtail/core/tests/test_permission_policies.py similarity index 99% rename from wagtail/wagtailcore/tests/test_permission_policies.py rename to wagtail/core/tests/test_permission_policies.py index 684cf6284..141acd685 100644 --- a/wagtail/wagtailcore/tests/test_permission_policies.py +++ b/wagtail/core/tests/test_permission_policies.py @@ -5,7 +5,7 @@ from django.contrib.auth.models import AnonymousUser, Group, Permission from django.contrib.contenttypes.models import ContentType from django.test import TestCase -from wagtail.wagtailcore.permission_policies import ( +from wagtail.core.permission_policies import ( AuthenticationOnlyPermissionPolicy, BlanketPermissionPolicy, ModelPermissionPolicy, OwnershipPermissionPolicy) from wagtail.wagtailimages.models import Image diff --git a/wagtail/wagtailcore/tests/test_rich_text.py b/wagtail/core/tests/test_rich_text.py similarity index 98% rename from wagtail/wagtailcore/tests/test_rich_text.py rename to wagtail/core/tests/test_rich_text.py index 4dd3951d4..240b1fa21 100644 --- a/wagtail/wagtailcore/tests/test_rich_text.py +++ b/wagtail/core/tests/test_rich_text.py @@ -4,8 +4,8 @@ from bs4 import BeautifulSoup from django.test import TestCase from mock import patch -from wagtail.wagtailcore.models import Page -from wagtail.wagtailcore.rich_text import ( +from wagtail.core.models import Page +from wagtail.core.rich_text import ( DbWhitelister, FeatureRegistry, PageLinkHandler, RichText, expand_db_html, extract_attrs) diff --git a/wagtail/wagtailcore/tests/test_sites.py b/wagtail/core/tests/test_sites.py similarity index 99% rename from wagtail/wagtailcore/tests/test_sites.py rename to wagtail/core/tests/test_sites.py index 29d6a4c07..15bd1e6cb 100644 --- a/wagtail/wagtailcore/tests/test_sites.py +++ b/wagtail/core/tests/test_sites.py @@ -4,7 +4,7 @@ from django.core.exceptions import ValidationError from django.http.request import HttpRequest from django.test import TestCase, override_settings -from wagtail.wagtailcore.models import Page, Site +from wagtail.core.models import Page, Site class TestSiteNaturalKey(TestCase): diff --git a/wagtail/wagtailcore/tests/test_streamfield.py b/wagtail/core/tests/test_streamfield.py similarity index 97% rename from wagtail/wagtailcore/tests/test_streamfield.py rename to wagtail/core/tests/test_streamfield.py index 22c400322..b4ed770f5 100644 --- a/wagtail/wagtailcore/tests/test_streamfield.py +++ b/wagtail/core/tests/test_streamfield.py @@ -10,10 +10,10 @@ from django.test import TestCase from django.utils.safestring import SafeText from wagtail.tests.testapp.models import StreamModel -from wagtail.wagtailcore import blocks -from wagtail.wagtailcore.blocks import StreamValue -from wagtail.wagtailcore.fields import StreamField -from wagtail.wagtailcore.rich_text import RichText +from wagtail.core import blocks +from wagtail.core.blocks import StreamValue +from wagtail.core.fields import StreamField +from wagtail.core.rich_text import RichText from wagtail.wagtailimages.models import Image from wagtail.wagtailimages.tests.utils import get_test_image_file @@ -118,7 +118,7 @@ class TestSystemCheck(TestCase): def tearDown(self): # unregister InvalidStreamModel from the overall model registry # so that it doesn't break tests elsewhere - for package in ('wagtailcore', 'wagtail.wagtailcore.tests'): + for package in ('wagtailcore', 'wagtail.core.tests'): try: del apps.all_models[package]['invalidstreammodel'] except KeyError: diff --git a/wagtail/wagtailcore/tests/test_tests.py b/wagtail/core/tests/test_tests.py similarity index 98% rename from wagtail/wagtailcore/tests/test_tests.py rename to wagtail/core/tests/test_tests.py index 5ea170330..b149faca0 100644 --- a/wagtail/wagtailcore/tests/test_tests.py +++ b/wagtail/core/tests/test_tests.py @@ -6,7 +6,7 @@ from wagtail.tests.testapp.models import ( BusinessChild, BusinessIndex, BusinessNowherePage, BusinessSubIndex, EventIndex, EventPage, SimplePage, StreamPage) from wagtail.tests.utils import WagtailPageTests, WagtailTestUtils -from wagtail.wagtailcore.models import PAGE_MODEL_CLASSES, Page, Site +from wagtail.core.models import PAGE_MODEL_CLASSES, Page, Site class TestAssertTagInHTML(WagtailTestUtils, TestCase): diff --git a/wagtail/wagtailcore/tests/test_utils.py b/wagtail/core/tests/test_utils.py similarity index 96% rename from wagtail/wagtailcore/tests/test_utils.py rename to wagtail/core/tests/test_utils.py index 5962ce2ef..aa10efe59 100644 --- a/wagtail/wagtailcore/tests/test_utils.py +++ b/wagtail/core/tests/test_utils.py @@ -4,7 +4,7 @@ from __future__ import absolute_import, unicode_literals from django.test import TestCase from django.utils.text import slugify -from wagtail.wagtailcore.utils import accepts_kwarg, cautious_slugify +from wagtail.core.utils import accepts_kwarg, cautious_slugify class TestCautiousSlugify(TestCase): diff --git a/wagtail/wagtailcore/tests/test_views.py b/wagtail/core/tests/test_views.py similarity index 97% rename from wagtail/wagtailcore/tests/test_views.py rename to wagtail/core/tests/test_views.py index 8df118d05..25d23b8c8 100644 --- a/wagtail/wagtailcore/tests/test_views.py +++ b/wagtail/core/tests/test_views.py @@ -4,7 +4,7 @@ from django.test import TestCase from django.urls import reverse from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page class TestLoginView(TestCase, WagtailTestUtils): diff --git a/wagtail/wagtailcore/tests/test_whitelist.py b/wagtail/core/tests/test_whitelist.py similarity index 99% rename from wagtail/wagtailcore/tests/test_whitelist.py rename to wagtail/core/tests/test_whitelist.py index 21dadb2df..dc803e927 100644 --- a/wagtail/wagtailcore/tests/test_whitelist.py +++ b/wagtail/core/tests/test_whitelist.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from bs4 import BeautifulSoup from django.test import TestCase -from wagtail.wagtailcore.whitelist import ( +from wagtail.core.whitelist import ( Whitelister, allow_without_attributes, attribute_rule, check_url) diff --git a/wagtail/wagtailcore/tests/tests.py b/wagtail/core/tests/tests.py similarity index 97% rename from wagtail/wagtailcore/tests/tests.py rename to wagtail/core/tests/tests.py index 036ee3bf8..3f0678bcc 100644 --- a/wagtail/wagtailcore/tests/tests.py +++ b/wagtail/core/tests/tests.py @@ -7,9 +7,9 @@ from django.test import TestCase from django.utils.safestring import SafeText from wagtail.tests.testapp.models import SimplePage -from wagtail.wagtailcore.models import Page, Site -from wagtail.wagtailcore.templatetags.wagtailcore_tags import richtext -from wagtail.wagtailcore.utils import resolve_model_string +from wagtail.core.models import Page, Site +from wagtail.core.templatetags.wagtailcore_tags import richtext +from wagtail.core.utils import resolve_model_string class TestPageUrlTags(TestCase): @@ -196,7 +196,7 @@ class TestResolveModelString(TestCase): self.assertEqual(model, Page) def test_resolve_from_string_invalid(self): - self.assertRaises(ValueError, resolve_model_string, 'wagtail.wagtailcore.Page') + self.assertRaises(ValueError, resolve_model_string, 'wagtail.core.Page') def test_resolve_from_string_with_incorrect_default_app(self): self.assertRaises(LookupError, resolve_model_string, 'Page', default_app='wagtailadmin') diff --git a/wagtail/wagtailcore/url_routing.py b/wagtail/core/url_routing.py similarity index 100% rename from wagtail/wagtailcore/url_routing.py rename to wagtail/core/url_routing.py diff --git a/wagtail/wagtailcore/urls.py b/wagtail/core/urls.py similarity index 92% rename from wagtail/wagtailcore/urls.py rename to wagtail/core/urls.py index f69252e01..fddf473af 100644 --- a/wagtail/wagtailcore/urls.py +++ b/wagtail/core/urls.py @@ -4,8 +4,8 @@ from django.conf import settings from django.conf.urls import url from django.contrib.auth import views as auth_views -from wagtail.wagtailcore import views -from wagtail.wagtailcore.utils import WAGTAIL_APPEND_SLASH +from wagtail.core import views +from wagtail.core.utils import WAGTAIL_APPEND_SLASH if WAGTAIL_APPEND_SLASH: # If WAGTAIL_APPEND_SLASH is True (the default value), we match a diff --git a/wagtail/wagtailcore/utils.py b/wagtail/core/utils.py similarity index 100% rename from wagtail/wagtailcore/utils.py rename to wagtail/core/utils.py diff --git a/wagtail/wagtailcore/views.py b/wagtail/core/views.py similarity index 87% rename from wagtail/wagtailcore/views.py rename to wagtail/core/views.py index 6231a656b..dd77b4ef4 100644 --- a/wagtail/wagtailcore/views.py +++ b/wagtail/core/views.py @@ -4,13 +4,13 @@ from django.http import Http404, HttpResponse from django.shortcuts import get_object_or_404, redirect from django.urls import reverse -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.forms import PasswordViewRestrictionForm -from wagtail.wagtailcore.models import Page, PageViewRestriction +from wagtail.core import hooks +from wagtail.core.forms import PasswordViewRestrictionForm +from wagtail.core.models import Page, PageViewRestriction def serve(request, path): - # we need a valid Site object corresponding to this request (set in wagtail.wagtailcore.middleware.SiteMiddleware) + # we need a valid Site object corresponding to this request (set in wagtail.core.middleware.SiteMiddleware) # in order to proceed if not request.site: raise Http404 diff --git a/wagtail/wagtailcore/wagtail_hooks.py b/wagtail/core/wagtail_hooks.py similarity index 89% rename from wagtail/wagtailcore/wagtail_hooks.py rename to wagtail/core/wagtail_hooks.py index 90a1f9c0b..0d40a1f50 100644 --- a/wagtail/wagtailcore/wagtail_hooks.py +++ b/wagtail/core/wagtail_hooks.py @@ -4,8 +4,8 @@ from django.conf import settings from django.contrib.auth.views import redirect_to_login from django.urls import reverse -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import PageViewRestriction +from wagtail.core import hooks +from wagtail.core.models import PageViewRestriction def require_wagtail_login(next): @@ -25,7 +25,7 @@ def check_view_restrictions(page, request, serve_args, serve_kwargs): for restriction in page.get_view_restrictions(): if not restriction.accept_request(request): if restriction.restriction_type == PageViewRestriction.PASSWORD: - from wagtail.wagtailcore.forms import PasswordViewRestrictionForm + from wagtail.core.forms import PasswordViewRestrictionForm form = PasswordViewRestrictionForm(instance=restriction, initial={'return_url': request.get_full_path()}) action_url = reverse('wagtailcore_authenticate_with_password', args=[restriction.id, page.id]) diff --git a/wagtail/wagtailcore/whitelist.py b/wagtail/core/whitelist.py similarity index 100% rename from wagtail/wagtailcore/whitelist.py rename to wagtail/core/whitelist.py diff --git a/wagtail/project_template/home/models.py b/wagtail/project_template/home/models.py index 6a7e12aff..ba5cd4d16 100644 --- a/wagtail/project_template/home/models.py +++ b/wagtail/project_template/home/models.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.db import models -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page class HomePage(Page): diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py index 5fea6e77b..e98b4a9d9 100644 --- a/wagtail/project_template/project_name/settings/base.py +++ b/wagtail/project_template/project_name/settings/base.py @@ -39,7 +39,7 @@ INSTALLED_APPS = [ 'wagtail.wagtailimages', 'wagtail.wagtailsearch', 'wagtail.wagtailadmin', - 'wagtail.wagtailcore', + 'wagtail.core', 'modelcluster', 'taggit', @@ -61,7 +61,7 @@ MIDDLEWARE = [ 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware', - 'wagtail.wagtailcore.middleware.SiteMiddleware', + 'wagtail.core.middleware.SiteMiddleware', 'wagtail.wagtailredirects.middleware.RedirectMiddleware', ] diff --git a/wagtail/project_template/project_name/urls.py b/wagtail/project_template/project_name/urls.py index 43a134940..5b94d3618 100644 --- a/wagtail/project_template/project_name/urls.py +++ b/wagtail/project_template/project_name/urls.py @@ -5,7 +5,7 @@ from django.conf.urls import include, url from django.contrib import admin from wagtail.wagtailadmin import urls as wagtailadmin_urls -from wagtail.wagtailcore import urls as wagtail_urls +from wagtail.core import urls as wagtail_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls from search import views as search_views diff --git a/wagtail/project_template/search/views.py b/wagtail/project_template/search/views.py index e17a1e9ea..9313b35c5 100644 --- a/wagtail/project_template/search/views.py +++ b/wagtail/project_template/search/views.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator from django.shortcuts import render -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from wagtail.wagtailsearch.models import Query diff --git a/wagtail/tests/demosite/migrations/0001_initial.py b/wagtail/tests/demosite/migrations/0001_initial.py index 7ae7530a6..b69b41593 100644 --- a/wagtail/tests/demosite/migrations/0001_initial.py +++ b/wagtail/tests/demosite/migrations/0001_initial.py @@ -6,7 +6,7 @@ import modelcluster.contrib.taggit import modelcluster.fields from django.db import migrations, models -import wagtail.wagtailcore.fields +import wagtail.core.fields class Migration(migrations.Migration): @@ -33,7 +33,7 @@ class Migration(migrations.Migration): primary_key=True ) ), - ('body', wagtail.wagtailcore.fields.RichTextField()), + ('body', wagtail.core.fields.RichTextField()), ('date', models.DateField(verbose_name='Post date')), ( 'feed_image', @@ -143,7 +143,7 @@ class Migration(migrations.Migration): primary_key=True ) ), - ('intro', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('intro', wagtail.core.fields.RichTextField(blank=True)), ], options={ 'abstract': False, @@ -195,7 +195,7 @@ class Migration(migrations.Migration): primary_key=True ) ), - ('body', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('body', wagtail.core.fields.RichTextField(blank=True)), ( 'feed_image', models.ForeignKey( @@ -226,7 +226,7 @@ class Migration(migrations.Migration): primary_key=True ) ), - ('intro', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('intro', wagtail.core.fields.RichTextField(blank=True)), ], options={ 'abstract': False, @@ -285,7 +285,7 @@ class Migration(migrations.Migration): ('time_to', models.TimeField(null=True, verbose_name='End time', blank=True)), ('audience', models.CharField(choices=[('public', 'Public'), ('private', 'Private')], max_length=255)), ('location', models.CharField(max_length=255)), - ('body', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('body', wagtail.core.fields.RichTextField(blank=True)), ('cost', models.CharField(max_length=255)), ('signup_link', models.URLField(blank=True)), ( @@ -390,7 +390,7 @@ class Migration(migrations.Migration): related_name='+', primary_key=True )), - ('body', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('body', wagtail.core.fields.RichTextField(blank=True)), ], options={ 'verbose_name': 'Homepage', @@ -465,8 +465,8 @@ class Migration(migrations.Migration): ), ('first_name', models.CharField(max_length=255)), ('last_name', models.CharField(max_length=255)), - ('intro', wagtail.wagtailcore.fields.RichTextField(blank=True)), - ('biography', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('intro', wagtail.core.fields.RichTextField(blank=True)), + ('biography', wagtail.core.fields.RichTextField(blank=True)), ( 'feed_image', models.ForeignKey( @@ -524,7 +524,7 @@ class Migration(migrations.Migration): primary_key=True ) ), - ('intro', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('intro', wagtail.core.fields.RichTextField(blank=True)), ('feed_image', models.ForeignKey( to='wagtailimages.Image', @@ -567,8 +567,8 @@ class Migration(migrations.Migration): to='wagtailcore.Page', serialize=False, parent_link=True, related_name='+', primary_key=True ) ), - ('intro', wagtail.wagtailcore.fields.RichTextField(blank=True)), - ('body', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('intro', wagtail.core.fields.RichTextField(blank=True)), + ('body', wagtail.core.fields.RichTextField(blank=True)), ( 'feed_image', models.ForeignKey( diff --git a/wagtail/tests/demosite/models.py b/wagtail/tests/demosite/models.py index d6d07cea0..ed535ff99 100644 --- a/wagtail/tests/demosite/models.py +++ b/wagtail/tests/demosite/models.py @@ -11,8 +11,8 @@ from wagtail.api import APIField from wagtail.utils.pagination import paginate from wagtail.wagtailadmin.edit_handlers import ( FieldPanel, InlinePanel, MultiFieldPanel, PageChooserPanel) -from wagtail.wagtailcore.fields import RichTextField -from wagtail.wagtailcore.models import Orderable, Page +from wagtail.core.fields import RichTextField +from wagtail.core.models import Orderable, Page from wagtail.wagtaildocs.edit_handlers import DocumentChooserPanel from wagtail.wagtailimages.api.fields import ImageRenditionField from wagtail.wagtailimages.edit_handlers import ImageChooserPanel diff --git a/wagtail/tests/modeladmintest/models.py b/wagtail/tests/modeladmintest/models.py index b8a48308a..8d1eba93b 100644 --- a/wagtail/tests/modeladmintest/models.py +++ b/wagtail/tests/modeladmintest/models.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.db import models -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from wagtail.wagtailsearch import index diff --git a/wagtail/tests/non_root_urls.py b/wagtail/tests/non_root_urls.py index a815e43e5..ea4265c76 100644 --- a/wagtail/tests/non_root_urls.py +++ b/wagtail/tests/non_root_urls.py @@ -6,7 +6,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import include, url from wagtail.wagtailadmin import urls as wagtailadmin_urls -from wagtail.wagtailcore import urls as wagtail_urls +from wagtail.core import urls as wagtail_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls from wagtail.wagtailimages import urls as wagtailimages_urls from wagtail.wagtailsearch import urls as wagtailsearch_urls diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py index e416cf2a2..121648453 100644 --- a/wagtail/tests/settings.py +++ b/wagtail/tests/settings.py @@ -77,7 +77,7 @@ TEMPLATES = [ ], 'OPTIONS': { 'extensions': [ - 'wagtail.wagtailcore.jinja2tags.core', + 'wagtail.core.jinja2tags.core', 'wagtail.wagtailadmin.jinja2tags.userbar', 'wagtail.wagtailimages.jinja2tags.images', 'wagtail.contrib.settings.jinja2tags.settings', @@ -94,7 +94,7 @@ MIDDLEWARE = ( 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'wagtail.wagtailcore.middleware.SiteMiddleware', + 'wagtail.core.middleware.SiteMiddleware', 'wagtail.wagtailredirects.middleware.RedirectMiddleware', ) @@ -128,7 +128,7 @@ INSTALLED_APPS = ( 'wagtail.wagtaildocs', 'wagtail.wagtailadmin', 'wagtail.api.v2', - 'wagtail.wagtailcore', + 'wagtail.core', 'taggit', 'rest_framework', diff --git a/wagtail/tests/snippets/migrations/0005_multisectionrichtextsnippet_richtextsection.py b/wagtail/tests/snippets/migrations/0005_multisectionrichtextsnippet_richtextsection.py index edd929b0b..631cfc2eb 100644 --- a/wagtail/tests/snippets/migrations/0005_multisectionrichtextsnippet_richtextsection.py +++ b/wagtail/tests/snippets/migrations/0005_multisectionrichtextsnippet_richtextsection.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import migrations, models -import wagtail.wagtailcore.fields +import wagtail.core.fields import modelcluster.fields @@ -26,7 +26,7 @@ class Migration(migrations.Migration): name='RichTextSection', fields=[ ('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)), - ('body', wagtail.wagtailcore.fields.RichTextField()), + ('body', wagtail.core.fields.RichTextField()), ('snippet', modelcluster.fields.ParentalKey(to='snippetstests.MultiSectionRichTextSnippet', related_name='sections', on_delete=models.CASCADE)), ], ), diff --git a/wagtail/tests/snippets/models.py b/wagtail/tests/snippets/models.py index 624e19140..17d702e10 100644 --- a/wagtail/tests/snippets/models.py +++ b/wagtail/tests/snippets/models.py @@ -5,7 +5,7 @@ from modelcluster.fields import ParentalKey from modelcluster.models import ClusterableModel from wagtail.wagtailadmin.edit_handlers import FieldPanel, InlinePanel -from wagtail.wagtailcore.fields import RichTextField +from wagtail.core.fields import RichTextField from wagtail.wagtailsearch import index from wagtail.wagtailsnippets.models import register_snippet diff --git a/wagtail/tests/testapp/blocks.py b/wagtail/tests/testapp/blocks.py index 6307a5bf2..b0854f539 100644 --- a/wagtail/tests/testapp/blocks.py +++ b/wagtail/tests/testapp/blocks.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from wagtail.wagtailcore import blocks +from wagtail.core import blocks class LinkBlock(blocks.StructBlock): diff --git a/wagtail/tests/testapp/migrations/0001_initial.py b/wagtail/tests/testapp/migrations/0001_initial.py index a00770678..44ef2a7f1 100644 --- a/wagtail/tests/testapp/migrations/0001_initial.py +++ b/wagtail/tests/testapp/migrations/0001_initial.py @@ -9,8 +9,8 @@ import taggit.managers from django.conf import settings from django.db import migrations, models -import wagtail.wagtailcore.blocks -import wagtail.wagtailcore.fields +import wagtail.core.blocks +import wagtail.core.fields import wagtail.wagtailimages.blocks import wagtail.wagtailimages.models import wagtail.wagtailsearch.index @@ -183,7 +183,7 @@ class Migration(migrations.Migration): name='EventIndex', fields=[ ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), - ('intro', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('intro', wagtail.core.fields.RichTextField(blank=True)), ], options={ 'abstract': False, @@ -200,7 +200,7 @@ class Migration(migrations.Migration): ('time_to', models.TimeField(blank=True, null=True, verbose_name='End time')), ('audience', models.CharField(choices=[('public', 'Public'), ('private', 'Private')], max_length=255)), ('location', models.CharField(max_length=255)), - ('body', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('body', wagtail.core.fields.RichTextField(blank=True)), ('cost', models.CharField(max_length=255)), ('signup_link', models.URLField(blank=True)), ], @@ -328,7 +328,7 @@ class Migration(migrations.Migration): name='ManyToManyBlogPage', fields=[ ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), - ('body', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('body', wagtail.core.fields.RichTextField(blank=True)), ('adverts', models.ManyToManyField(blank=True, to='tests.Advert')), ('blog_categories', models.ManyToManyField(blank=True, through='tests.BlogCategoryBlogPage', to='tests.BlogCategory')), ], @@ -436,14 +436,14 @@ class Migration(migrations.Migration): name='StreamModel', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('body', wagtail.wagtailcore.fields.StreamField((('text', wagtail.wagtailcore.blocks.CharBlock()), ('rich_text', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())))), + ('body', wagtail.core.fields.StreamField((('text', wagtail.core.blocks.CharBlock()), ('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())))), ], ), migrations.CreateModel( name='StreamPage', fields=[ ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), - ('body', wagtail.wagtailcore.fields.StreamField((('text', wagtail.wagtailcore.blocks.CharBlock()), ('rich_text', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())))), + ('body', wagtail.core.fields.StreamField((('text', wagtail.core.blocks.CharBlock()), ('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())))), ], options={ 'abstract': False, diff --git a/wagtail/tests/testapp/migrations/0002_customimage_collections.py b/wagtail/tests/testapp/migrations/0002_customimage_collections.py index 053bc19a0..f098db654 100644 --- a/wagtail/tests/testapp/migrations/0002_customimage_collections.py +++ b/wagtail/tests/testapp/migrations/0002_customimage_collections.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import django.db.models.deletion from django.db import migrations, models -import wagtail.wagtailcore.models +import wagtail.core.models class Migration(migrations.Migration): @@ -19,11 +19,11 @@ class Migration(migrations.Migration): migrations.AddField( model_name='customimage', name='collection', - field=models.ForeignKey(default=wagtail.wagtailcore.models.get_root_collection_id, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.Collection', verbose_name='collection'), + field=models.ForeignKey(default=wagtail.core.models.get_root_collection_id, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.Collection', verbose_name='collection'), ), migrations.AddField( model_name='customimagefilepath', name='collection', - field=models.ForeignKey(default=wagtail.wagtailcore.models.get_root_collection_id, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.Collection', verbose_name='collection'), + field=models.ForeignKey(default=wagtail.core.models.get_root_collection_id, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.Collection', verbose_name='collection'), ), ] diff --git a/wagtail/tests/testapp/migrations/0005_customrichblockfieldpage_customrichtextfieldpage_defaultrichblockfieldpage_defaultrichtextfieldpage.py b/wagtail/tests/testapp/migrations/0005_customrichblockfieldpage_customrichtextfieldpage_defaultrichblockfieldpage_defaultrichtextfieldpage.py index df72c9f64..e4ad4e567 100644 --- a/wagtail/tests/testapp/migrations/0005_customrichblockfieldpage_customrichtextfieldpage_defaultrichblockfieldpage_defaultrichtextfieldpage.py +++ b/wagtail/tests/testapp/migrations/0005_customrichblockfieldpage_customrichtextfieldpage_defaultrichblockfieldpage_defaultrichtextfieldpage.py @@ -4,8 +4,8 @@ from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion -import wagtail.wagtailcore.blocks -import wagtail.wagtailcore.fields +import wagtail.core.blocks +import wagtail.core.fields class Migration(migrations.Migration): @@ -20,7 +20,7 @@ class Migration(migrations.Migration): name='CustomRichBlockFieldPage', fields=[ ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), - ('body', wagtail.wagtailcore.fields.StreamField([('rich_text', wagtail.wagtailcore.blocks.RichTextBlock(editor='custom'))])), + ('body', wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock(editor='custom'))])), ], options={ 'abstract': False, @@ -31,7 +31,7 @@ class Migration(migrations.Migration): name='CustomRichTextFieldPage', fields=[ ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), - ('body', wagtail.wagtailcore.fields.RichTextField()), + ('body', wagtail.core.fields.RichTextField()), ], options={ 'abstract': False, @@ -42,7 +42,7 @@ class Migration(migrations.Migration): name='DefaultRichBlockFieldPage', fields=[ ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), - ('body', wagtail.wagtailcore.fields.StreamField([('rich_text', wagtail.wagtailcore.blocks.RichTextBlock())])), + ('body', wagtail.core.fields.StreamField([('rich_text', wagtail.core.blocks.RichTextBlock())])), ], options={ 'abstract': False, @@ -53,7 +53,7 @@ class Migration(migrations.Migration): name='DefaultRichTextFieldPage', fields=[ ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), - ('body', wagtail.wagtailcore.fields.RichTextField()), + ('body', wagtail.core.fields.RichTextField()), ], options={ 'abstract': False, diff --git a/wagtail/tests/testapp/migrations/0006_sectionedrichtextpage_sectionedrichtextpagesection.py b/wagtail/tests/testapp/migrations/0006_sectionedrichtextpage_sectionedrichtextpagesection.py index 65fb44fd3..7721eb1dd 100644 --- a/wagtail/tests/testapp/migrations/0006_sectionedrichtextpage_sectionedrichtextpagesection.py +++ b/wagtail/tests/testapp/migrations/0006_sectionedrichtextpage_sectionedrichtextpagesection.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import migrations, models import modelcluster.fields -import wagtail.wagtailcore.fields +import wagtail.core.fields class Migration(migrations.Migration): @@ -29,7 +29,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', primary_key=True, serialize=False, auto_created=True)), ('sort_order', models.IntegerField(editable=False, null=True, blank=True)), - ('body', wagtail.wagtailcore.fields.RichTextField()), + ('body', wagtail.core.fields.RichTextField()), ('page', modelcluster.fields.ParentalKey(related_name='sections', to='tests.SectionedRichTextPage', on_delete=models.CASCADE)), ], options={ diff --git a/wagtail/tests/testapp/migrations/0008_inlinestreampage_inlinestreampagesection.py b/wagtail/tests/testapp/migrations/0008_inlinestreampage_inlinestreampagesection.py index c36817a73..01f1d18dc 100644 --- a/wagtail/tests/testapp/migrations/0008_inlinestreampage_inlinestreampagesection.py +++ b/wagtail/tests/testapp/migrations/0008_inlinestreampage_inlinestreampagesection.py @@ -5,8 +5,8 @@ from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion import modelcluster.fields -import wagtail.wagtailcore.blocks -import wagtail.wagtailcore.fields +import wagtail.core.blocks +import wagtail.core.fields import wagtail.wagtailimages.blocks @@ -33,7 +33,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), - ('body', wagtail.wagtailcore.fields.StreamField((('text', wagtail.wagtailcore.blocks.CharBlock()), ('rich_text', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())))), + ('body', wagtail.core.fields.StreamField((('text', wagtail.core.blocks.CharBlock()), ('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())))), ('page', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='sections', to='tests.InlineStreamPage')), ], options={ diff --git a/wagtail/tests/testapp/migrations/0009_defaultstreampage.py b/wagtail/tests/testapp/migrations/0009_defaultstreampage.py index 9a71a5464..a2689576d 100644 --- a/wagtail/tests/testapp/migrations/0009_defaultstreampage.py +++ b/wagtail/tests/testapp/migrations/0009_defaultstreampage.py @@ -4,8 +4,8 @@ from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion -import wagtail.wagtailcore.blocks -import wagtail.wagtailcore.fields +import wagtail.core.blocks +import wagtail.core.fields import wagtail.wagtailimages.blocks @@ -21,7 +21,7 @@ class Migration(migrations.Migration): name='DefaultStreamPage', fields=[ ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), - ('body', wagtail.wagtailcore.fields.StreamField((('text', wagtail.wagtailcore.blocks.CharBlock()), ('rich_text', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())), default='')), + ('body', wagtail.core.fields.StreamField((('text', wagtail.core.blocks.CharBlock()), ('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())), default='')), ], options={ 'abstract': False, diff --git a/wagtail/tests/testapp/migrations/0010_auto_20160823_1056.py b/wagtail/tests/testapp/migrations/0010_auto_20160823_1056.py index 1cf1e1771..dc66d2191 100644 --- a/wagtail/tests/testapp/migrations/0010_auto_20160823_1056.py +++ b/wagtail/tests/testapp/migrations/0010_auto_20160823_1056.py @@ -6,7 +6,7 @@ from django.conf import settings from django.db import migrations, models import django.db.models.deletion import modelcluster.fields -import wagtail.wagtailcore.fields +import wagtail.core.fields class Migration(migrations.Migration): @@ -54,8 +54,8 @@ class Migration(migrations.Migration): ('to_address', models.CharField(blank=True, help_text='Optional - form submissions will be emailed to these addresses. Separate multiple addresses by comma.', max_length=255, verbose_name='to address')), ('from_address', models.CharField(blank=True, max_length=255, verbose_name='from address')), ('subject', models.CharField(blank=True, max_length=255, verbose_name='subject')), - ('intro', wagtail.wagtailcore.fields.RichTextField(blank=True)), - ('thank_you_text', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('intro', wagtail.core.fields.RichTextField(blank=True)), + ('thank_you_text', wagtail.core.fields.RichTextField(blank=True)), ], options={ 'abstract': False, diff --git a/wagtail/tests/testapp/migrations/0013_auto_20161220_1957.py b/wagtail/tests/testapp/migrations/0013_auto_20161220_1957.py index e3f6e443d..d68343ebd 100644 --- a/wagtail/tests/testapp/migrations/0013_auto_20161220_1957.py +++ b/wagtail/tests/testapp/migrations/0013_auto_20161220_1957.py @@ -4,8 +4,8 @@ from __future__ import unicode_literals from django.db import migrations import wagtail.tests.testapp.models -import wagtail.wagtailcore.blocks -import wagtail.wagtailcore.fields +import wagtail.core.blocks +import wagtail.core.fields class Migration(migrations.Migration): @@ -18,6 +18,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='streampage', name='body', - field=wagtail.wagtailcore.fields.StreamField([('text', wagtail.wagtailcore.blocks.CharBlock()), ('rich_text', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.tests.testapp.models.ExtendedImageChooserBlock())]), + field=wagtail.core.fields.StreamField([('text', wagtail.core.blocks.CharBlock()), ('rich_text', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.tests.testapp.models.ExtendedImageChooserBlock())]), ), ] diff --git a/wagtail/tests/testapp/migrations/0019_richtextfieldwithfeaturespage.py b/wagtail/tests/testapp/migrations/0019_richtextfieldwithfeaturespage.py index ebdc6cf78..861d244a1 100644 --- a/wagtail/tests/testapp/migrations/0019_richtextfieldwithfeaturespage.py +++ b/wagtail/tests/testapp/migrations/0019_richtextfieldwithfeaturespage.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion -import wagtail.wagtailcore.fields +import wagtail.core.fields class Migration(migrations.Migration): @@ -19,7 +19,7 @@ class Migration(migrations.Migration): name='RichTextFieldWithFeaturesPage', fields=[ ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), - ('body', wagtail.wagtailcore.fields.RichTextField()), + ('body', wagtail.core.fields.RichTextField()), ], options={ 'abstract': False, diff --git a/wagtail/tests/testapp/migrations/0020_customdocument.py b/wagtail/tests/testapp/migrations/0020_customdocument.py index 397b8e264..a79617a1d 100644 --- a/wagtail/tests/testapp/migrations/0020_customdocument.py +++ b/wagtail/tests/testapp/migrations/0020_customdocument.py @@ -6,7 +6,7 @@ from django.conf import settings from django.db import migrations, models import django.db.models.deletion import taggit.managers -import wagtail.wagtailcore.models +import wagtail.core.models import wagtail.wagtailsearch.index @@ -27,7 +27,7 @@ class Migration(migrations.Migration): ('title', models.CharField(max_length=255, verbose_name='title')), ('file', models.FileField(upload_to='documents', verbose_name='file')), ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='created at')), - ('collection', models.ForeignKey(default=wagtail.wagtailcore.models.get_root_collection_id, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.Collection', verbose_name='collection')), + ('collection', models.ForeignKey(default=wagtail.core.models.get_root_collection_id, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='wagtailcore.Collection', verbose_name='collection')), ('tags', taggit.managers.TaggableManager(blank=True, help_text=None, through='taggit.TaggedItem', to='taggit.Tag', verbose_name='tags')), ('uploaded_by_user', models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='uploaded by user')), ], diff --git a/wagtail/tests/testapp/models.py b/wagtail/tests/testapp/models.py index 1bb53fa13..b8e283d3e 100644 --- a/wagtail/tests/testapp/models.py +++ b/wagtail/tests/testapp/models.py @@ -24,9 +24,9 @@ from wagtail.wagtailadmin.edit_handlers import ( TabbedInterface) from wagtail.wagtailadmin.forms import WagtailAdminPageForm from wagtail.wagtailadmin.utils import send_mail -from wagtail.wagtailcore.blocks import CharBlock, RichTextBlock -from wagtail.wagtailcore.fields import RichTextField, StreamField -from wagtail.wagtailcore.models import Orderable, Page, PageManager, PageQuerySet +from wagtail.core.blocks import CharBlock, RichTextBlock +from wagtail.core.fields import RichTextField, StreamField +from wagtail.core.models import Orderable, Page, PageManager, PageQuerySet from wagtail.wagtaildocs.edit_handlers import DocumentChooserPanel from wagtail.wagtaildocs.models import AbstractDocument, Document from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField, AbstractFormSubmission diff --git a/wagtail/tests/testapp/wagtail_hooks.py b/wagtail/tests/testapp/wagtail_hooks.py index 41b4d1686..74eec1a75 100644 --- a/wagtail/tests/testapp/wagtail_hooks.py +++ b/wagtail/tests/testapp/wagtail_hooks.py @@ -7,8 +7,8 @@ from django.http import HttpResponse from wagtail.wagtailadmin.menu import MenuItem from wagtail.wagtailadmin.rich_text import HalloPlugin from wagtail.wagtailadmin.search import SearchArea -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.whitelist import allow_without_attributes, attribute_rule, check_url +from wagtail.core import hooks +from wagtail.core.whitelist import allow_without_attributes, attribute_rule, check_url # Register one hook using decorators... diff --git a/wagtail/tests/urls.py b/wagtail/tests/urls.py index f8079ef66..e10b46b2a 100644 --- a/wagtail/tests/urls.py +++ b/wagtail/tests/urls.py @@ -8,7 +8,7 @@ from wagtail.contrib.wagtailsitemaps import views as sitemaps_views from wagtail.contrib.wagtailsitemaps import Sitemap from wagtail.tests.testapp import urls as testapp_urls from wagtail.wagtailadmin import urls as wagtailadmin_urls -from wagtail.wagtailcore import urls as wagtail_urls +from wagtail.core import urls as wagtail_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls from wagtail.wagtaildocs.api.v2.endpoints import DocumentsAPIEndpoint from wagtail.wagtailimages import urls as wagtailimages_urls diff --git a/wagtail/tests/utils.py b/wagtail/tests/utils.py index c31614f53..fb1ec4d2b 100644 --- a/wagtail/tests/utils.py +++ b/wagtail/tests/utils.py @@ -105,7 +105,7 @@ class WagtailTestUtils(object): @contextmanager def register_hook(self, hook_name, fn, order=0): - from wagtail.wagtailcore import hooks + from wagtail.core import hooks hooks.register(hook_name, fn, order) try: diff --git a/wagtail/wagtailadmin/api/endpoints.py b/wagtail/wagtailadmin/api/endpoints.py index 0f0a8a7c4..e26db0ce2 100644 --- a/wagtail/wagtailadmin/api/endpoints.py +++ b/wagtail/wagtailadmin/api/endpoints.py @@ -7,7 +7,7 @@ from wagtail.api.v2.filters import ( ChildOfFilter, DescendantOfFilter, FieldsFilter, ForExplorerFilter, OrderingFilter, SearchFilter) from wagtail.api.v2.utils import BadRequestError, filter_page_type, page_models_from_string -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from .filters import HasChildrenFilter from .serializers import AdminPageSerializer diff --git a/wagtail/wagtailadmin/api/serializers.py b/wagtail/wagtailadmin/api/serializers.py index 376d69091..aa23df62f 100644 --- a/wagtail/wagtailadmin/api/serializers.py +++ b/wagtail/wagtailadmin/api/serializers.py @@ -6,7 +6,7 @@ from rest_framework.fields import Field, ReadOnlyField from wagtail.api.v2.serializers import PageSerializer from wagtail.api.v2.utils import get_full_url -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page def get_model_listing_url(context, model): diff --git a/wagtail/wagtailadmin/api/urls.py b/wagtail/wagtailadmin/api/urls.py index f6512ab9a..0b830f79b 100644 --- a/wagtail/wagtailadmin/api/urls.py +++ b/wagtail/wagtailadmin/api/urls.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import url from wagtail.api.v2.router import WagtailAPIRouter -from wagtail.wagtailcore import hooks +from wagtail.core import hooks from .endpoints import PagesAdminAPIEndpoint diff --git a/wagtail/wagtailadmin/blocks.py b/wagtail/wagtailadmin/blocks.py index b46ebc3b0..3b2ea2266 100644 --- a/wagtail/wagtailadmin/blocks.py +++ b/wagtail/wagtailadmin/blocks.py @@ -2,6 +2,6 @@ from __future__ import absolute_import, unicode_literals import warnings -from wagtail.wagtailcore.blocks import * # noqa +from wagtail.core.blocks import * # noqa -warnings.warn("wagtail.wagtailadmin.blocks has moved to wagtail.wagtailcore.blocks", UserWarning, stacklevel=2) +warnings.warn("wagtail.wagtailadmin.blocks has moved to wagtail.core.blocks", UserWarning, stacklevel=2) diff --git a/wagtail/wagtailadmin/checks.py b/wagtail/wagtailadmin/checks.py index 64b500d61..fe872b7bd 100644 --- a/wagtail/wagtailadmin/checks.py +++ b/wagtail/wagtailadmin/checks.py @@ -35,7 +35,7 @@ def css_install_check(app_configs, **kwargs): @register() def base_form_class_check(app_configs, **kwargs): from wagtail.wagtailadmin.forms import WagtailAdminPageForm - from wagtail.wagtailcore.models import get_page_models + from wagtail.core.models import get_page_models errors = [] @@ -56,7 +56,7 @@ def base_form_class_check(app_configs, **kwargs): @register() def get_form_class_check(app_configs, **kwargs): from wagtail.wagtailadmin.forms import WagtailAdminPageForm - from wagtail.wagtailcore.models import get_page_models + from wagtail.core.models import get_page_models errors = [] diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index 2d4b23a07..150a67143 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -15,9 +15,9 @@ from taggit.managers import TaggableManager from wagtail.utils.decorators import cached_classmethod from wagtail.wagtailadmin import compare, widgets -from wagtail.wagtailcore.fields import RichTextField -from wagtail.wagtailcore.models import Page -from wagtail.wagtailcore.utils import camelcase_to_underscore, resolve_model_string +from wagtail.core.fields import RichTextField +from wagtail.core.models import Page +from wagtail.core.utils import camelcase_to_underscore, resolve_model_string # DIRECT_FORM_FIELD_OVERRIDES, FORM_FIELD_OVERRIDES are imported for backwards # compatibility, as people are likely importing them from here and then diff --git a/wagtail/wagtailadmin/forms.py b/wagtail/wagtailadmin/forms.py index e6657a6ba..bca042b00 100644 --- a/wagtail/wagtailadmin/forms.py +++ b/wagtail/wagtailadmin/forms.py @@ -19,7 +19,7 @@ from modelcluster.forms import ClusterForm, ClusterFormMetaclass from taggit.managers import TaggableManager from wagtail.wagtailadmin import widgets -from wagtail.wagtailcore.models import ( +from wagtail.core.models import ( BaseViewRestriction, Collection, CollectionViewRestriction, GroupCollectionPermission, Page, PageViewRestriction) diff --git a/wagtail/wagtailadmin/menu.py b/wagtail/wagtailadmin/menu.py index ba65bf753..23de55bd2 100644 --- a/wagtail/wagtailadmin/menu.py +++ b/wagtail/wagtailadmin/menu.py @@ -8,7 +8,7 @@ from django.utils.safestring import mark_safe from django.utils.six import with_metaclass from django.utils.text import slugify -from wagtail.wagtailcore import hooks +from wagtail.core import hooks class MenuItem(with_metaclass(MediaDefiningClass)): diff --git a/wagtail/wagtailadmin/navigation.py b/wagtail/wagtailadmin/navigation.py index a7b4d7e3f..400ee87d8 100644 --- a/wagtail/wagtailadmin/navigation.py +++ b/wagtail/wagtailadmin/navigation.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page def get_pages_with_direct_explore_permission(user): diff --git a/wagtail/wagtailadmin/rich_text.py b/wagtail/wagtailadmin/rich_text.py index d4d70e0c8..8db904352 100644 --- a/wagtail/wagtailadmin/rich_text.py +++ b/wagtail/wagtailadmin/rich_text.py @@ -9,7 +9,7 @@ from django.utils.module_loading import import_string from wagtail.utils.widgets import WidgetWithScript from wagtail.wagtailadmin.edit_handlers import RichTextFieldPanel -from wagtail.wagtailcore.rich_text import DbWhitelister, expand_db_html, features +from wagtail.core.rich_text import DbWhitelister, expand_db_html, features class HalloPlugin(object): diff --git a/wagtail/wagtailadmin/search.py b/wagtail/wagtailadmin/search.py index 799a96ef0..8cd34a722 100644 --- a/wagtail/wagtailadmin/search.py +++ b/wagtail/wagtailadmin/search.py @@ -9,7 +9,7 @@ from django.utils.six import with_metaclass from django.utils.text import slugify from wagtail.wagtailadmin.forms import SearchForm -from wagtail.wagtailcore import hooks +from wagtail.core import hooks @total_ordering diff --git a/wagtail/wagtailadmin/site_summary.py b/wagtail/wagtailadmin/site_summary.py index 33502433d..8d9f7e02f 100644 --- a/wagtail/wagtailadmin/site_summary.py +++ b/wagtail/wagtailadmin/site_summary.py @@ -3,8 +3,8 @@ from __future__ import absolute_import, unicode_literals from django.template.loader import render_to_string from wagtail.wagtailadmin.utils import user_has_any_page_permission -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Page, Site +from wagtail.core import hooks +from wagtail.core.models import Page, Site class SummaryItem(object): diff --git a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py index e05a882fd..55a1a5bea 100644 --- a/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py +++ b/wagtail/wagtailadmin/templatetags/wagtailadmin_tags.py @@ -15,11 +15,11 @@ from wagtail.utils.pagination import DEFAULT_PAGE_KEY, replace_page_in_query from wagtail.wagtailadmin.menu import admin_menu from wagtail.wagtailadmin.navigation import get_explorable_root_page from wagtail.wagtailadmin.search import admin_search_areas -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import ( +from wagtail.core import hooks +from wagtail.core.models import ( CollectionViewRestriction, Page, PageViewRestriction, UserPagePermissionsProxy) -from wagtail.wagtailcore.utils import cautious_slugify as _cautious_slugify -from wagtail.wagtailcore.utils import camelcase_to_underscore, escape_script +from wagtail.core.utils import cautious_slugify as _cautious_slugify +from wagtail.core.utils import camelcase_to_underscore, escape_script register = template.Library() diff --git a/wagtail/wagtailadmin/templatetags/wagtailuserbar.py b/wagtail/wagtailadmin/templatetags/wagtailuserbar.py index ab31e72fe..60e720c0f 100644 --- a/wagtail/wagtailadmin/templatetags/wagtailuserbar.py +++ b/wagtail/wagtailadmin/templatetags/wagtailuserbar.py @@ -6,8 +6,8 @@ from django.template.loader import render_to_string from wagtail.wagtailadmin.userbar import ( AddPageItem, AdminItem, ApproveModerationEditPageItem, EditPageItem, ExplorePageItem, RejectModerationEditPageItem) -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import PAGE_TEMPLATE_VAR, Page, PageRevision +from wagtail.core import hooks +from wagtail.core.models import PAGE_TEMPLATE_VAR, Page, PageRevision # from django.contrib.auth.decorators import permission_required diff --git a/wagtail/wagtailadmin/tests/api/test_pages.py b/wagtail/wagtailadmin/tests/api/test_pages.py index 9bdd448d5..80122ea93 100644 --- a/wagtail/wagtailadmin/tests/api/test_pages.py +++ b/wagtail/wagtailadmin/tests/api/test_pages.py @@ -10,7 +10,7 @@ from django.utils import timezone from wagtail.api.v2.tests.test_pages import TestPageDetail, TestPageListing from wagtail.tests.demosite import models from wagtail.tests.testapp.models import SimplePage, StreamPage -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from .utils import AdminAPITestCase diff --git a/wagtail/wagtailadmin/tests/test_admin_search.py b/wagtail/wagtailadmin/tests/test_admin_search.py index f4207b3d0..7f422e87f 100644 --- a/wagtail/wagtailadmin/tests/test_admin_search.py +++ b/wagtail/wagtailadmin/tests/test_admin_search.py @@ -10,7 +10,7 @@ from django.urls import reverse from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailadmin.utils import user_has_any_page_permission -from wagtail.wagtailcore.models import Site +from wagtail.core.models import Site class BaseSearchAreaTestCase(WagtailTestUtils, TestCase): diff --git a/wagtail/wagtailadmin/tests/test_buttons_hooks.py b/wagtail/wagtailadmin/tests/test_buttons_hooks.py index a7771dbc1..598566640 100644 --- a/wagtail/wagtailadmin/tests/test_buttons_hooks.py +++ b/wagtail/wagtailadmin/tests/test_buttons_hooks.py @@ -5,8 +5,8 @@ from django.urls import reverse from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailadmin import widgets as wagtailadmin_widgets -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Page +from wagtail.core import hooks +from wagtail.core.models import Page class TestButtonsHooks(TestCase, WagtailTestUtils): diff --git a/wagtail/wagtailadmin/tests/test_collections_views.py b/wagtail/wagtailadmin/tests/test_collections_views.py index 5ef531024..292d83a2f 100644 --- a/wagtail/wagtailadmin/tests/test_collections_views.py +++ b/wagtail/wagtailadmin/tests/test_collections_views.py @@ -4,7 +4,7 @@ from django.test import TestCase from django.urls import reverse from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore.models import Collection +from wagtail.core.models import Collection from wagtail.wagtaildocs.models import Document diff --git a/wagtail/wagtailadmin/tests/test_compare.py b/wagtail/wagtailadmin/tests/test_compare.py index a0f5bba8e..07ff380c8 100644 --- a/wagtail/wagtailadmin/tests/test_compare.py +++ b/wagtail/wagtailadmin/tests/test_compare.py @@ -9,7 +9,7 @@ from django.utils.safestring import SafeText from wagtail.tests.testapp.models import ( EventCategory, EventPage, EventPageSpeaker, SimplePage, StreamPage, TaggedPage) from wagtail.wagtailadmin import compare -from wagtail.wagtailcore.blocks import StreamValue +from wagtail.core.blocks import StreamValue from wagtail.wagtailimages import get_image_model from wagtail.wagtailimages.tests.utils import get_test_image_file diff --git a/wagtail/wagtailadmin/tests/test_edit_handlers.py b/wagtail/wagtailadmin/tests/test_edit_handlers.py index ca18038d6..a615176af 100644 --- a/wagtail/wagtailadmin/tests/test_edit_handlers.py +++ b/wagtail/wagtailadmin/tests/test_edit_handlers.py @@ -18,7 +18,7 @@ from wagtail.wagtailadmin.edit_handlers import ( from wagtail.wagtailadmin.forms import WagtailAdminModelForm, WagtailAdminPageForm from wagtail.wagtailadmin.rich_text import HalloRichTextArea from wagtail.wagtailadmin.widgets import AdminAutoHeightTextInput, AdminDateInput, AdminPageChooser -from wagtail.wagtailcore.models import Page, Site +from wagtail.core.models import Page, Site from wagtail.wagtailimages.edit_handlers import ImageChooserPanel diff --git a/wagtail/wagtailadmin/tests/test_jinja2.py b/wagtail/wagtailadmin/tests/test_jinja2.py index d3cce7986..11e71d063 100644 --- a/wagtail/wagtailadmin/tests/test_jinja2.py +++ b/wagtail/wagtailadmin/tests/test_jinja2.py @@ -5,7 +5,7 @@ from django.contrib.auth.models import AnonymousUser from django.template import engines from django.test import TestCase -from wagtail.wagtailcore.models import PAGE_TEMPLATE_VAR, Page, Site +from wagtail.core.models import PAGE_TEMPLATE_VAR, Page, Site class TestCoreJinja(TestCase): diff --git a/wagtail/wagtailadmin/tests/test_page_chooser.py b/wagtail/wagtailadmin/tests/test_page_chooser.py index d4d9b2e38..58af1c69e 100644 --- a/wagtail/wagtailadmin/tests/test_page_chooser.py +++ b/wagtail/wagtailadmin/tests/test_page_chooser.py @@ -8,7 +8,7 @@ from django.utils.http import urlencode from wagtail.tests.testapp.models import EventIndex, EventPage, SimplePage, SingleEventPage from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailadmin.views.chooser import can_choose_page -from wagtail.wagtailcore.models import Page, UserPagePermissionsProxy +from wagtail.core.models import Page, UserPagePermissionsProxy class TestChooserBrowse(TestCase, WagtailTestUtils): diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py index cb0a7fe20..76e4b6eb3 100644 --- a/wagtail/wagtailadmin/tests/test_pages_views.py +++ b/wagtail/wagtailadmin/tests/test_pages_views.py @@ -28,8 +28,8 @@ from wagtail.tests.testapp.models import ( from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailadmin.views.home import RecentEditsPanel from wagtail.wagtailadmin.views.pages import PreviewOnEdit -from wagtail.wagtailcore.models import GroupPagePermission, Page, PageRevision, Site -from wagtail.wagtailcore.signals import page_published, page_unpublished +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.wagtailusers.models import UserProfile diff --git a/wagtail/wagtailadmin/tests/test_privacy.py b/wagtail/wagtailadmin/tests/test_privacy.py index b24ee1b06..eeeb5ef6b 100644 --- a/wagtail/wagtailadmin/tests/test_privacy.py +++ b/wagtail/wagtailadmin/tests/test_privacy.py @@ -6,7 +6,7 @@ from django.urls import reverse from wagtail.tests.testapp.models import SimplePage from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore.models import Page, PageViewRestriction +from wagtail.core.models import Page, PageViewRestriction class TestSetPrivacyView(TestCase, WagtailTestUtils): diff --git a/wagtail/wagtailadmin/tests/test_rich_text.py b/wagtail/wagtailadmin/tests/test_rich_text.py index 3ca6d1a7d..8bceb744d 100644 --- a/wagtail/wagtailadmin/tests/test_rich_text.py +++ b/wagtail/wagtailadmin/tests/test_rich_text.py @@ -9,9 +9,9 @@ from wagtail.tests.testapp.models import SingleEventPage from wagtail.tests.testapp.rich_text import CustomRichTextArea from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailadmin.rich_text import HalloRichTextArea, get_rich_text_editor_widget -from wagtail.wagtailcore.blocks import RichTextBlock -from wagtail.wagtailcore.models import Page, get_page_models -from wagtail.wagtailcore.rich_text import RichText +from wagtail.core.blocks import RichTextBlock +from wagtail.core.models import Page, get_page_models +from wagtail.core.rich_text import RichText class BaseRichTextEditHandlerTestCase(TestCase): diff --git a/wagtail/wagtailadmin/tests/test_userbar.py b/wagtail/wagtailadmin/tests/test_userbar.py index c82698465..28cbc9a09 100644 --- a/wagtail/wagtailadmin/tests/test_userbar.py +++ b/wagtail/wagtailadmin/tests/test_userbar.py @@ -9,7 +9,7 @@ from django.urls import reverse from wagtail.tests.testapp.models import BusinessChild, BusinessIndex from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore.models import PAGE_TEMPLATE_VAR, Page, Site +from wagtail.core.models import PAGE_TEMPLATE_VAR, Page, Site class TestUserbarTag(TestCase): diff --git a/wagtail/wagtailadmin/tests/test_widgets.py b/wagtail/wagtailadmin/tests/test_widgets.py index e1eeff909..99752970c 100644 --- a/wagtail/wagtailadmin/tests/test_widgets.py +++ b/wagtail/wagtailadmin/tests/test_widgets.py @@ -5,7 +5,7 @@ from django.test.utils import override_settings from wagtail.tests.testapp.models import EventPage, SimplePage from wagtail.wagtailadmin import widgets -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page class TestAdminPageChooserWidget(TestCase): diff --git a/wagtail/wagtailadmin/tests/tests.py b/wagtail/wagtailadmin/tests/tests.py index 7b2e17c23..220467da7 100644 --- a/wagtail/wagtailadmin/tests/tests.py +++ b/wagtail/wagtailadmin/tests/tests.py @@ -16,7 +16,7 @@ from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailadmin.menu import MenuItem from wagtail.wagtailadmin.site_summary import PagesSummaryItem from wagtail.wagtailadmin.utils import send_mail, user_has_any_page_permission -from wagtail.wagtailcore.models import Page, Site +from wagtail.core.models import Page, Site class TestHome(TestCase, WagtailTestUtils): diff --git a/wagtail/wagtailadmin/urls/__init__.py b/wagtail/wagtailadmin/urls/__init__.py index c94729d77..dabf9f844 100644 --- a/wagtail/wagtailadmin/urls/__init__.py +++ b/wagtail/wagtailadmin/urls/__init__.py @@ -11,7 +11,7 @@ from wagtail.wagtailadmin.urls import collections as wagtailadmin_collections_ur from wagtail.wagtailadmin.urls import password_reset as wagtailadmin_password_reset_urls from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar from wagtail.wagtailadmin.api import urls as api_urls -from wagtail.wagtailcore import hooks +from wagtail.core import hooks from wagtail.utils.urlpatterns import decorate_urlpatterns from wagtail.wagtailadmin.decorators import require_admin_access diff --git a/wagtail/wagtailadmin/utils.py b/wagtail/wagtailadmin/utils.py index 1d9a5396d..dcc12bb75 100644 --- a/wagtail/wagtailadmin/utils.py +++ b/wagtail/wagtailadmin/utils.py @@ -17,7 +17,7 @@ from django.utils.translation import override, ugettext_lazy from modelcluster.fields import ParentalKey from taggit.models import Tag -from wagtail.wagtailcore.models import GroupPagePermission, Page, PageRevision +from wagtail.core.models import GroupPagePermission, Page, PageRevision from wagtail.wagtailusers.models import UserProfile logger = logging.getLogger('wagtail.admin') diff --git a/wagtail/wagtailadmin/views/account.py b/wagtail/wagtailadmin/views/account.py index 4675ba2b1..6d9bdfda5 100644 --- a/wagtail/wagtailadmin/views/account.py +++ b/wagtail/wagtailadmin/views/account.py @@ -16,7 +16,7 @@ from django.views.decorators.debug import sensitive_post_parameters from wagtail.wagtailadmin import forms from wagtail.wagtailadmin.utils import get_available_admin_languages -from wagtail.wagtailcore.models import UserPagePermissionsProxy +from wagtail.core.models import UserPagePermissionsProxy from wagtail.wagtailusers.forms import NotificationPreferencesForm, PreferredLanguageForm from wagtail.wagtailusers.models import UserProfile diff --git a/wagtail/wagtailadmin/views/chooser.py b/wagtail/wagtailadmin/views/chooser.py index c0924b6b5..08d7db307 100644 --- a/wagtail/wagtailadmin/views/chooser.py +++ b/wagtail/wagtailadmin/views/chooser.py @@ -8,9 +8,9 @@ from django.shortcuts import get_object_or_404, render from wagtail.utils.pagination import paginate from wagtail.wagtailadmin.forms import EmailLinkChooserForm, ExternalLinkChooserForm, SearchForm from wagtail.wagtailadmin.modal_workflow import render_modal_workflow -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Page, UserPagePermissionsProxy -from wagtail.wagtailcore.utils import resolve_model_string +from wagtail.core import hooks +from wagtail.core.models import Page, UserPagePermissionsProxy +from wagtail.core.utils import resolve_model_string def shared_context(request, extra_context=None): diff --git a/wagtail/wagtailadmin/views/collection_privacy.py b/wagtail/wagtailadmin/views/collection_privacy.py index 8e537ed2d..48c62a71e 100644 --- a/wagtail/wagtailadmin/views/collection_privacy.py +++ b/wagtail/wagtailadmin/views/collection_privacy.py @@ -5,8 +5,8 @@ from django.shortcuts import get_object_or_404 from wagtail.wagtailadmin.forms import CollectionViewRestrictionForm from wagtail.wagtailadmin.modal_workflow import render_modal_workflow -from wagtail.wagtailcore.models import Collection, CollectionViewRestriction -from wagtail.wagtailcore.permissions import collection_permission_policy +from wagtail.core.models import Collection, CollectionViewRestriction +from wagtail.core.permissions import collection_permission_policy def set_privacy(request, collection_id): diff --git a/wagtail/wagtailadmin/views/collections.py b/wagtail/wagtailadmin/views/collections.py index 60ae98330..86b77fe85 100644 --- a/wagtail/wagtailadmin/views/collections.py +++ b/wagtail/wagtailadmin/views/collections.py @@ -7,9 +7,9 @@ from django.utils.translation import ugettext_lazy from wagtail.wagtailadmin import messages from wagtail.wagtailadmin.forms import CollectionForm from wagtail.wagtailadmin.views.generic import CreateView, DeleteView, EditView, IndexView -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Collection -from wagtail.wagtailcore.permissions import collection_permission_policy +from wagtail.core import hooks +from wagtail.core.models import Collection +from wagtail.core.permissions import collection_permission_policy class Index(IndexView): diff --git a/wagtail/wagtailadmin/views/generic.py b/wagtail/wagtailadmin/views/generic.py index 7bf07090a..3768f30db 100644 --- a/wagtail/wagtailadmin/views/generic.py +++ b/wagtail/wagtailadmin/views/generic.py @@ -15,7 +15,7 @@ from wagtail.wagtailadmin.utils import permission_denied class PermissionCheckedMixin(object): """ Mixin for class-based views to enforce permission checks according to - a permission policy (see wagtail.wagtailcore.permission_policies). + a permission policy (see wagtail.core.permission_policies). To take advantage of this, subclasses should set the class property: * permission_policy (a policy object) diff --git a/wagtail/wagtailadmin/views/home.py b/wagtail/wagtailadmin/views/home.py index e5fa94d01..63cecc0f7 100644 --- a/wagtail/wagtailadmin/views/home.py +++ b/wagtail/wagtailadmin/views/home.py @@ -11,8 +11,8 @@ from django.template.loader import render_to_string from wagtail.wagtailadmin.navigation import get_explorable_root_page from wagtail.wagtailadmin.site_summary import SiteSummaryPanel -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Page, PageRevision, UserPagePermissionsProxy +from wagtail.core import hooks +from wagtail.core.models import Page, PageRevision, UserPagePermissionsProxy User = get_user_model() diff --git a/wagtail/wagtailadmin/views/page_privacy.py b/wagtail/wagtailadmin/views/page_privacy.py index e6875807a..b313a7ffe 100644 --- a/wagtail/wagtailadmin/views/page_privacy.py +++ b/wagtail/wagtailadmin/views/page_privacy.py @@ -5,7 +5,7 @@ from django.shortcuts import get_object_or_404 from wagtail.wagtailadmin.forms import PageViewRestrictionForm from wagtail.wagtailadmin.modal_workflow import render_modal_workflow -from wagtail.wagtailcore.models import Page, PageViewRestriction +from wagtail.core.models import Page, PageViewRestriction def set_privacy(request, page_id): diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index 2c695ff78..e52c67d59 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -23,8 +23,8 @@ from wagtail.wagtailadmin import messages, signals from wagtail.wagtailadmin.forms import CopyForm, SearchForm from wagtail.wagtailadmin.utils import ( send_notification, user_has_any_page_permission, user_passes_test) -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Page, PageRevision, UserPagePermissionsProxy +from wagtail.core import hooks +from wagtail.core.models import Page, PageRevision, UserPagePermissionsProxy def get_valid_next_url_from_request(request): diff --git a/wagtail/wagtailadmin/views/userbar.py b/wagtail/wagtailadmin/views/userbar.py index d5582e96f..93a7d5d88 100644 --- a/wagtail/wagtailadmin/views/userbar.py +++ b/wagtail/wagtailadmin/views/userbar.py @@ -5,8 +5,8 @@ from django.shortcuts import render from wagtail.wagtailadmin.userbar import ( AddPageItem, ApproveModerationEditPageItem, EditPageItem, RejectModerationEditPageItem) -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Page, PageRevision +from wagtail.core import hooks +from wagtail.core.models import Page, PageRevision @permission_required('wagtailadmin.access_admin', raise_exception=True) diff --git a/wagtail/wagtailadmin/viewsets/__init__.py b/wagtail/wagtailadmin/viewsets/__init__.py index ef2fce901..68bba7036 100644 --- a/wagtail/wagtailadmin/viewsets/__init__.py +++ b/wagtail/wagtailadmin/viewsets/__init__.py @@ -1,6 +1,6 @@ from django.conf.urls import url, include -from wagtail.wagtailcore import hooks +from wagtail.core import hooks class ViewSetRegistry(object): diff --git a/wagtail/wagtailadmin/viewsets/model.py b/wagtail/wagtailadmin/viewsets/model.py index d3c111259..ff5741160 100644 --- a/wagtail/wagtailadmin/viewsets/model.py +++ b/wagtail/wagtailadmin/viewsets/model.py @@ -5,7 +5,7 @@ from django.core.exceptions import ImproperlyConfigured from django.forms.models import modelform_factory from wagtail.wagtailadmin.views import generic -from wagtail.wagtailcore.permissions import ModelPermissionPolicy +from wagtail.core.permissions import ModelPermissionPolicy from .base import ViewSet diff --git a/wagtail/wagtailadmin/wagtail_hooks.py b/wagtail/wagtailadmin/wagtail_hooks.py index 82b16d3dc..ba9f85a2b 100644 --- a/wagtail/wagtailadmin/wagtail_hooks.py +++ b/wagtail/wagtailadmin/wagtail_hooks.py @@ -12,8 +12,8 @@ from wagtail.wagtailadmin.search import SearchArea from wagtail.wagtailadmin.utils import user_has_any_page_permission from wagtail.wagtailadmin.viewsets import viewsets from wagtail.wagtailadmin.widgets import Button, ButtonWithDropdownFromHook, PageListingButton -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.permissions import collection_permission_policy +from wagtail.core import hooks +from wagtail.core.permissions import collection_permission_policy class ExplorerMenuItem(MenuItem): diff --git a/wagtail/wagtailadmin/widgets.py b/wagtail/wagtailadmin/widgets.py index 96694704e..05367edb1 100644 --- a/wagtail/wagtailadmin/widgets.py +++ b/wagtail/wagtailadmin/widgets.py @@ -17,8 +17,8 @@ from taggit.forms import TagWidget from wagtail.utils.widgets import WidgetWithScript from wagtail.wagtailadmin.datetimepicker import to_datetimepicker_format -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Page +from wagtail.core import hooks +from wagtail.core.models import Page DEFAULT_DATE_FORMAT = '%Y-%m-%d' DEFAULT_DATETIME_FORMAT = '%Y-%m-%d %H:%M' diff --git a/wagtail/wagtaildocs/blocks.py b/wagtail/wagtaildocs/blocks.py index d09e176f0..35cfc50ea 100644 --- a/wagtail/wagtaildocs/blocks.py +++ b/wagtail/wagtaildocs/blocks.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.functional import cached_property from django.utils.html import format_html -from wagtail.wagtailcore.blocks import ChooserBlock +from wagtail.core.blocks import ChooserBlock class DocumentChooserBlock(ChooserBlock): diff --git a/wagtail/wagtaildocs/migrations/0005_document_collection.py b/wagtail/wagtaildocs/migrations/0005_document_collection.py index 7d5509d61..317d2d654 100644 --- a/wagtail/wagtaildocs/migrations/0005_document_collection.py +++ b/wagtail/wagtaildocs/migrations/0005_document_collection.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import migrations, models -import wagtail.wagtailcore.models +import wagtail.core.models class Migration(migrations.Migration): @@ -17,7 +17,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='document', name='collection', - field=models.ForeignKey(related_name='+', to='wagtailcore.Collection', verbose_name='collection', default=wagtail.wagtailcore.models.get_root_collection_id, on_delete=models.CASCADE), + field=models.ForeignKey(related_name='+', to='wagtailcore.Collection', verbose_name='collection', default=wagtail.core.models.get_root_collection_id, on_delete=models.CASCADE), preserve_default=True, ), ] diff --git a/wagtail/wagtaildocs/models.py b/wagtail/wagtaildocs/models.py index 4191fd326..f27031aa0 100644 --- a/wagtail/wagtaildocs/models.py +++ b/wagtail/wagtaildocs/models.py @@ -11,7 +11,7 @@ from django.utils.translation import ugettext_lazy as _ from taggit.managers import TaggableManager from wagtail.wagtailadmin.utils import get_object_usage -from wagtail.wagtailcore.models import CollectionMember +from wagtail.core.models import CollectionMember from wagtail.wagtailsearch import index from wagtail.wagtailsearch.queryset import SearchableQuerySetMixin diff --git a/wagtail/wagtaildocs/permissions.py b/wagtail/wagtaildocs/permissions.py index 2a240e13b..f3fcd5e35 100644 --- a/wagtail/wagtaildocs/permissions.py +++ b/wagtail/wagtaildocs/permissions.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from wagtail.wagtailcore.permission_policies.collections import CollectionOwnershipPermissionPolicy +from wagtail.core.permission_policies.collections import CollectionOwnershipPermissionPolicy from wagtail.wagtaildocs.models import Document, get_document_model permission_policy = CollectionOwnershipPermissionPolicy( diff --git a/wagtail/wagtaildocs/tests/test_admin_views.py b/wagtail/wagtaildocs/tests/test_admin_views.py index 354738465..7e94bf08c 100644 --- a/wagtail/wagtaildocs/tests/test_admin_views.py +++ b/wagtail/wagtaildocs/tests/test_admin_views.py @@ -13,7 +13,7 @@ from django.utils.six import b from wagtail.tests.testapp.models import EventPage, EventPageRelatedLink from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore.models import Collection, GroupCollectionPermission, Page +from wagtail.core.models import Collection, GroupCollectionPermission, Page from wagtail.wagtaildocs import models diff --git a/wagtail/wagtaildocs/tests/test_collection_privacy.py b/wagtail/wagtaildocs/tests/test_collection_privacy.py index a859ccaed..a0915ef24 100644 --- a/wagtail/wagtaildocs/tests/test_collection_privacy.py +++ b/wagtail/wagtaildocs/tests/test_collection_privacy.py @@ -6,7 +6,7 @@ from django.test import TestCase from django.urls import reverse from django.utils.six import b -from wagtail.wagtailcore.models import Collection, CollectionViewRestriction +from wagtail.core.models import Collection, CollectionViewRestriction from wagtail.wagtaildocs.models import Document try: diff --git a/wagtail/wagtaildocs/tests/test_models.py b/wagtail/wagtaildocs/tests/test_models.py index 5ec9fb5e2..c89c9947d 100644 --- a/wagtail/wagtaildocs/tests/test_models.py +++ b/wagtail/wagtaildocs/tests/test_models.py @@ -7,7 +7,7 @@ from django.db import transaction from django.test import TestCase, TransactionTestCase from django.test.utils import override_settings -from wagtail.wagtailcore.models import Collection, GroupCollectionPermission +from wagtail.core.models import Collection, GroupCollectionPermission from wagtail.wagtaildocs import models, signal_handlers from wagtail.wagtaildocs.models import get_document_model from wagtail.wagtailimages.tests.utils import get_test_image_file diff --git a/wagtail/wagtaildocs/views/chooser.py b/wagtail/wagtaildocs/views/chooser.py index a1099652d..ab902c3e7 100644 --- a/wagtail/wagtaildocs/views/chooser.py +++ b/wagtail/wagtaildocs/views/chooser.py @@ -9,8 +9,8 @@ from wagtail.utils.pagination import paginate from wagtail.wagtailadmin.forms import SearchForm from wagtail.wagtailadmin.modal_workflow import render_modal_workflow from wagtail.wagtailadmin.utils import PermissionPolicyChecker -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Collection +from wagtail.core import hooks +from wagtail.core.models import Collection from wagtail.wagtaildocs.forms import get_document_form from wagtail.wagtaildocs.models import get_document_model from wagtail.wagtaildocs.permissions import permission_policy diff --git a/wagtail/wagtaildocs/views/documents.py b/wagtail/wagtaildocs/views/documents.py index 873d01ccd..0cf155fba 100644 --- a/wagtail/wagtaildocs/views/documents.py +++ b/wagtail/wagtaildocs/views/documents.py @@ -10,7 +10,7 @@ from wagtail.wagtailadmin import messages from wagtail.wagtailadmin.forms import SearchForm from wagtail.wagtailadmin.utils import ( PermissionPolicyChecker, permission_denied, popular_tags_for_model) -from wagtail.wagtailcore.models import Collection +from wagtail.core.models import Collection from wagtail.wagtaildocs.forms import get_document_form from wagtail.wagtaildocs.models import get_document_model from wagtail.wagtaildocs.permissions import permission_policy diff --git a/wagtail/wagtaildocs/views/serve.py b/wagtail/wagtaildocs/views/serve.py index e62c6c8a0..da55aade3 100644 --- a/wagtail/wagtaildocs/views/serve.py +++ b/wagtail/wagtaildocs/views/serve.py @@ -10,9 +10,9 @@ from django.urls import reverse from wagtail.utils import sendfile_streaming_backend from wagtail.utils.sendfile import sendfile -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.forms import PasswordViewRestrictionForm -from wagtail.wagtailcore.models import CollectionViewRestriction +from wagtail.core import hooks +from wagtail.core.forms import PasswordViewRestrictionForm +from wagtail.core.models import CollectionViewRestriction from wagtail.wagtaildocs.models import document_served, get_document_model diff --git a/wagtail/wagtaildocs/wagtail_hooks.py b/wagtail/wagtaildocs/wagtail_hooks.py index bf60688eb..3402ed644 100644 --- a/wagtail/wagtaildocs/wagtail_hooks.py +++ b/wagtail/wagtaildocs/wagtail_hooks.py @@ -13,9 +13,9 @@ from wagtail.wagtailadmin.menu import MenuItem from wagtail.wagtailadmin.rich_text import HalloPlugin from wagtail.wagtailadmin.search import SearchArea from wagtail.wagtailadmin.site_summary import SummaryItem -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import BaseViewRestriction -from wagtail.wagtailcore.wagtail_hooks import require_wagtail_login +from wagtail.core import hooks +from wagtail.core.models import BaseViewRestriction +from wagtail.core.wagtail_hooks import require_wagtail_login from wagtail.wagtaildocs import admin_urls from wagtail.wagtaildocs.api.admin.endpoints import DocumentsAdminAPIEndpoint from wagtail.wagtaildocs.forms import GroupDocumentPermissionFormSet @@ -159,7 +159,7 @@ def check_view_restrictions(document, request): for restriction in document.collection.get_view_restrictions(): if not restriction.accept_request(request): if restriction.restriction_type == BaseViewRestriction.PASSWORD: - from wagtail.wagtailcore.forms import PasswordViewRestrictionForm + from wagtail.core.forms import PasswordViewRestrictionForm form = PasswordViewRestrictionForm(instance=restriction, initial={'return_url': request.get_full_path()}) action_url = reverse('wagtaildocs_authenticate_with_password', args=[restriction.id]) diff --git a/wagtail/wagtailembeds/blocks.py b/wagtail/wagtailembeds/blocks.py index c50df81e7..47dfc90ab 100644 --- a/wagtail/wagtailembeds/blocks.py +++ b/wagtail/wagtailembeds/blocks.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from wagtail.wagtailcore import blocks +from wagtail.core import blocks from wagtail.wagtailembeds.format import embed_to_frontend_html diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py index fe8fccf8f..45fa02710 100644 --- a/wagtail/wagtailembeds/tests.py +++ b/wagtail/wagtailembeds/tests.py @@ -12,7 +12,7 @@ from django.urls import reverse from mock import patch from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore import blocks +from wagtail.core import blocks from wagtail.wagtailembeds import oembed_providers from wagtail.wagtailembeds.blocks import EmbedBlock, EmbedValue from wagtail.wagtailembeds.embeds import get_embed diff --git a/wagtail/wagtailembeds/wagtail_hooks.py b/wagtail/wagtailembeds/wagtail_hooks.py index 6ce1b08ca..ad17a49d1 100644 --- a/wagtail/wagtailembeds/wagtail_hooks.py +++ b/wagtail/wagtailembeds/wagtail_hooks.py @@ -5,7 +5,7 @@ from django.urls import reverse from django.utils.html import format_html from wagtail.wagtailadmin.rich_text import HalloPlugin -from wagtail.wagtailcore import hooks +from wagtail.core import hooks from wagtail.wagtailembeds import urls from wagtail.wagtailembeds.rich_text import MediaEmbedHandler diff --git a/wagtail/wagtailforms/models.py b/wagtail/wagtailforms/models.py index ca7380cb8..2de5d81dc 100644 --- a/wagtail/wagtailforms/models.py +++ b/wagtail/wagtailforms/models.py @@ -13,8 +13,8 @@ from unidecode import unidecode from wagtail.wagtailadmin.edit_handlers import FieldPanel from wagtail.wagtailadmin.utils import send_mail -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Orderable, Page, UserPagePermissionsProxy, get_page_models +from wagtail.core import hooks +from wagtail.core.models import Orderable, Page, UserPagePermissionsProxy, get_page_models from .forms import FormBuilder, WagtailAdminFormPageForm diff --git a/wagtail/wagtailforms/tests/test_forms.py b/wagtail/wagtailforms/tests/test_forms.py index 13aad9b1b..1d8058135 100644 --- a/wagtail/wagtailforms/tests/test_forms.py +++ b/wagtail/wagtailforms/tests/test_forms.py @@ -5,7 +5,7 @@ from django import forms from django.test import TestCase from wagtail.tests.testapp.models import FormField, FormPage -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from wagtail.wagtailforms.forms import FormBuilder diff --git a/wagtail/wagtailforms/tests/test_models.py b/wagtail/wagtailforms/tests/test_models.py index a960be1cc..61ccca489 100644 --- a/wagtail/wagtailforms/tests/test_models.py +++ b/wagtail/wagtailforms/tests/test_models.py @@ -8,7 +8,7 @@ from django.test import TestCase from wagtail.tests.testapp.models import CustomFormPageSubmission, FormField, JadeFormPage from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from wagtail.wagtailforms.models import FormSubmission from wagtail.wagtailforms.tests.utils import make_form_page, make_form_page_with_custom_submission diff --git a/wagtail/wagtailforms/tests/test_views.py b/wagtail/wagtailforms/tests/test_views.py index bc2825ef4..dd54dd831 100644 --- a/wagtail/wagtailforms/tests/test_views.py +++ b/wagtail/wagtailforms/tests/test_views.py @@ -12,7 +12,7 @@ from wagtail.tests.testapp.models import ( from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailadmin.edit_handlers import get_form_for_model from wagtail.wagtailadmin.forms import WagtailAdminPageForm -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from wagtail.wagtailforms.edit_handlers import FormSubmissionsPanel from wagtail.wagtailforms.models import FormSubmission from wagtail.wagtailforms.tests.utils import make_form_page, make_form_page_with_custom_submission diff --git a/wagtail/wagtailforms/tests/utils.py b/wagtail/wagtailforms/tests/utils.py index bc94f324b..c09dc8bdd 100644 --- a/wagtail/wagtailforms/tests/utils.py +++ b/wagtail/wagtailforms/tests/utils.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from wagtail.tests.testapp.models import ( FormField, FormFieldWithCustomSubmission, FormPage, FormPageWithCustomSubmission) -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page def make_form_page(**kwargs): diff --git a/wagtail/wagtailforms/views.py b/wagtail/wagtailforms/views.py index 046c8a43e..4691686f9 100644 --- a/wagtail/wagtailforms/views.py +++ b/wagtail/wagtailforms/views.py @@ -11,7 +11,7 @@ from django.utils.translation import ungettext from wagtail.utils.pagination import paginate from wagtail.wagtailadmin import messages -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from wagtail.wagtailforms.forms import SelectDateForm from wagtail.wagtailforms.models import get_forms_for_user diff --git a/wagtail/wagtailforms/wagtail_hooks.py b/wagtail/wagtailforms/wagtail_hooks.py index f79d7015b..9207524ec 100644 --- a/wagtail/wagtailforms/wagtail_hooks.py +++ b/wagtail/wagtailforms/wagtail_hooks.py @@ -5,7 +5,7 @@ from django.urls import reverse from django.utils.translation import ugettext_lazy as _ from wagtail.wagtailadmin.menu import MenuItem -from wagtail.wagtailcore import hooks +from wagtail.core import hooks from wagtail.wagtailforms import urls from wagtail.wagtailforms.models import get_forms_for_user diff --git a/wagtail/wagtailimages/blocks.py b/wagtail/wagtailimages/blocks.py index 05c6d5bff..5bd10691e 100644 --- a/wagtail/wagtailimages/blocks.py +++ b/wagtail/wagtailimages/blocks.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.functional import cached_property -from wagtail.wagtailcore.blocks import ChooserBlock +from wagtail.core.blocks import ChooserBlock from .shortcuts import get_rendition_or_not_found diff --git a/wagtail/wagtailimages/migrations/0011_image_collection.py b/wagtail/wagtailimages/migrations/0011_image_collection.py index bc962024d..719c9fdea 100644 --- a/wagtail/wagtailimages/migrations/0011_image_collection.py +++ b/wagtail/wagtailimages/migrations/0011_image_collection.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import migrations, models -import wagtail.wagtailcore.models +import wagtail.core.models class Migration(migrations.Migration): @@ -17,6 +17,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='image', name='collection', - field=models.ForeignKey(to='wagtailcore.Collection', verbose_name='collection', default=wagtail.wagtailcore.models.get_root_collection_id, related_name='+', on_delete=models.CASCADE), + field=models.ForeignKey(to='wagtailcore.Collection', verbose_name='collection', default=wagtail.core.models.get_root_collection_id, related_name='+', on_delete=models.CASCADE), ), ] diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py index 700d2b14a..632b9d4a6 100644 --- a/wagtail/wagtailimages/models.py +++ b/wagtail/wagtailimages/models.py @@ -21,8 +21,8 @@ from unidecode import unidecode from willow.image import Image as WillowImage from wagtail.wagtailadmin.utils import get_object_usage -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import CollectionMember +from wagtail.core import hooks +from wagtail.core.models import CollectionMember from wagtail.wagtailimages.exceptions import InvalidFilterSpecError from wagtail.wagtailimages.rect import Rect from wagtail.wagtailsearch import index diff --git a/wagtail/wagtailimages/permissions.py b/wagtail/wagtailimages/permissions.py index 8e9fab540..1772c769c 100644 --- a/wagtail/wagtailimages/permissions.py +++ b/wagtail/wagtailimages/permissions.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from wagtail.wagtailcore.permission_policies.collections import CollectionOwnershipPermissionPolicy +from wagtail.core.permission_policies.collections import CollectionOwnershipPermissionPolicy from wagtail.wagtailimages import get_image_model from wagtail.wagtailimages.models import Image diff --git a/wagtail/wagtailimages/tests/test_admin_views.py b/wagtail/wagtailimages/tests/test_admin_views.py index 97d27ad1f..41799e30c 100644 --- a/wagtail/wagtailimages/tests/test_admin_views.py +++ b/wagtail/wagtailimages/tests/test_admin_views.py @@ -11,7 +11,7 @@ from django.urls import reverse from django.utils.http import RFC3986_SUBDELIMS, urlquote from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore.models import Collection, GroupCollectionPermission +from wagtail.core.models import Collection, GroupCollectionPermission from wagtail.wagtailimages.views.serve import generate_signature from .utils import Image, get_test_image_file diff --git a/wagtail/wagtailimages/tests/test_image_operations.py b/wagtail/wagtailimages/tests/test_image_operations.py index daac02220..cbb86167a 100644 --- a/wagtail/wagtailimages/tests/test_image_operations.py +++ b/wagtail/wagtailimages/tests/test_image_operations.py @@ -5,7 +5,7 @@ from io import BytesIO from django.test import TestCase, override_settings from mock import Mock, patch -from wagtail.wagtailcore import hooks +from wagtail.core import hooks from wagtail.wagtailimages import image_operations from wagtail.wagtailimages.exceptions import InvalidFilterSpecError from wagtail.wagtailimages.models import Filter, Image diff --git a/wagtail/wagtailimages/tests/test_jinja2.py b/wagtail/wagtailimages/tests/test_jinja2.py index 0ea834db8..40c828c8a 100644 --- a/wagtail/wagtailimages/tests/test_jinja2.py +++ b/wagtail/wagtailimages/tests/test_jinja2.py @@ -7,7 +7,7 @@ from django.core import serializers from django.template import engines from django.test import TestCase -from wagtail.wagtailcore.models import Site +from wagtail.core.models import Site from .utils import Image, get_test_image_file diff --git a/wagtail/wagtailimages/tests/test_models.py b/wagtail/wagtailimages/tests/test_models.py index b6505d65c..5cdb5fcf5 100644 --- a/wagtail/wagtailimages/tests/test_models.py +++ b/wagtail/wagtailimages/tests/test_models.py @@ -13,7 +13,7 @@ from willow.image import Image as WillowImage from wagtail.tests.testapp.models import EventPage, EventPageCarouselItem from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore.models import Collection, GroupCollectionPermission, Page +from wagtail.core.models import Collection, GroupCollectionPermission, Page from wagtail.wagtailimages.models import Rendition, SourceImageIOError from wagtail.wagtailimages.rect import Rect diff --git a/wagtail/wagtailimages/tests/test_signal_handlers.py b/wagtail/wagtailimages/tests/test_signal_handlers.py index 9ffc75b10..3ea115f10 100644 --- a/wagtail/wagtailimages/tests/test_signal_handlers.py +++ b/wagtail/wagtailimages/tests/test_signal_handlers.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.db import transaction from django.test import TransactionTestCase, override_settings -from wagtail.wagtailcore.models import Collection +from wagtail.core.models import Collection from wagtail.wagtailimages import get_image_model, signal_handlers from wagtail.wagtailimages.tests.utils import get_test_image_file diff --git a/wagtail/wagtailimages/views/chooser.py b/wagtail/wagtailimages/views/chooser.py index 43f0b49a6..09a5e1bd0 100644 --- a/wagtail/wagtailimages/views/chooser.py +++ b/wagtail/wagtailimages/views/chooser.py @@ -9,8 +9,8 @@ from wagtail.utils.pagination import paginate from wagtail.wagtailadmin.forms import SearchForm from wagtail.wagtailadmin.modal_workflow import render_modal_workflow from wagtail.wagtailadmin.utils import PermissionPolicyChecker, popular_tags_for_model -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import Collection +from wagtail.core import hooks +from wagtail.core.models import Collection from wagtail.wagtailimages import get_image_model from wagtail.wagtailimages.formats import get_image_format from wagtail.wagtailimages.forms import ImageInsertionForm, get_image_form diff --git a/wagtail/wagtailimages/views/images.py b/wagtail/wagtailimages/views/images.py index aa6b523a6..b3d241a30 100644 --- a/wagtail/wagtailimages/views/images.py +++ b/wagtail/wagtailimages/views/images.py @@ -14,7 +14,7 @@ from wagtail.wagtailadmin import messages from wagtail.wagtailadmin.forms import SearchForm from wagtail.wagtailadmin.utils import ( PermissionPolicyChecker, permission_denied, popular_tags_for_model) -from wagtail.wagtailcore.models import Collection, Site +from wagtail.core.models import Collection, Site from wagtail.wagtailimages import get_image_model from wagtail.wagtailimages.exceptions import InvalidFilterSpecError from wagtail.wagtailimages.forms import URLGeneratorForm, get_image_form diff --git a/wagtail/wagtailimages/wagtail_hooks.py b/wagtail/wagtailimages/wagtail_hooks.py index b0a8c419a..db7a9915d 100644 --- a/wagtail/wagtailimages/wagtail_hooks.py +++ b/wagtail/wagtailimages/wagtail_hooks.py @@ -11,7 +11,7 @@ from wagtail.wagtailadmin.menu import MenuItem from wagtail.wagtailadmin.rich_text import HalloPlugin from wagtail.wagtailadmin.search import SearchArea from wagtail.wagtailadmin.site_summary import SummaryItem -from wagtail.wagtailcore import hooks +from wagtail.core import hooks from wagtail.wagtailimages import admin_urls, get_image_model, image_operations from wagtail.wagtailimages.api.admin.endpoints import ImagesAdminAPIEndpoint from wagtail.wagtailimages.forms import GroupImagePermissionFormSet diff --git a/wagtail/wagtailredirects/forms.py b/wagtail/wagtailredirects/forms.py index 88879cbd5..32826adbe 100644 --- a/wagtail/wagtailredirects/forms.py +++ b/wagtail/wagtailredirects/forms.py @@ -4,7 +4,7 @@ from django import forms from django.utils.translation import ugettext_lazy as _ from wagtail.wagtailadmin.widgets import AdminPageChooser -from wagtail.wagtailcore.models import Site +from wagtail.core.models import Site from wagtail.wagtailredirects.models import Redirect diff --git a/wagtail/wagtailredirects/permissions.py b/wagtail/wagtailredirects/permissions.py index 6fa4326b6..eed23a1c3 100644 --- a/wagtail/wagtailredirects/permissions.py +++ b/wagtail/wagtailredirects/permissions.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from wagtail.wagtailcore.permission_policies import ModelPermissionPolicy +from wagtail.core.permission_policies import ModelPermissionPolicy from wagtail.wagtailredirects.models import Redirect permission_policy = ModelPermissionPolicy(Redirect) diff --git a/wagtail/wagtailredirects/tests.py b/wagtail/wagtailredirects/tests.py index 0360c0a3b..4d28f7b81 100644 --- a/wagtail/wagtailredirects/tests.py +++ b/wagtail/wagtailredirects/tests.py @@ -5,7 +5,7 @@ from django.test import TestCase, override_settings from django.urls import reverse from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore.models import Page, Site +from wagtail.core.models import Page, Site from wagtail.wagtailredirects import models diff --git a/wagtail/wagtailredirects/wagtail_hooks.py b/wagtail/wagtailredirects/wagtail_hooks.py index b531c813a..5ca93608d 100644 --- a/wagtail/wagtailredirects/wagtail_hooks.py +++ b/wagtail/wagtailredirects/wagtail_hooks.py @@ -6,7 +6,7 @@ from django.urls import reverse from django.utils.translation import ugettext_lazy as _ from wagtail.wagtailadmin.menu import MenuItem -from wagtail.wagtailcore import hooks +from wagtail.core import hooks from wagtail.wagtailredirects import urls from wagtail.wagtailredirects.permissions import permission_policy diff --git a/wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py b/wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py index 1508e9a6e..ce23fd297 100644 --- a/wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py +++ b/wagtail/wagtailsearch/tests/test_elasticsearch2_backend.py @@ -784,19 +784,19 @@ class TestBackendConfiguration(TestCase): class TestGetModelRoot(TestCase): def test_root_model(self): - from wagtail.wagtailcore.models import Page + from wagtail.core.models import Page self.assertEqual(get_model_root(Page), Page) def test_child_model(self): - from wagtail.wagtailcore.models import Page + from wagtail.core.models import Page from wagtail.tests.testapp.models import SimplePage self.assertEqual(get_model_root(SimplePage), Page) def test_grandchild_model(self): # MTIChildPage inherits from MTIBasePage which inherits from Page - from wagtail.wagtailcore.models import Page + from wagtail.core.models import Page from wagtail.tests.testapp.models import MTIChildPage self.assertEqual(get_model_root(MTIChildPage), Page) diff --git a/wagtail/wagtailsearch/tests/test_frontend.py b/wagtail/wagtailsearch/tests/test_frontend.py index 6bfe2b661..f7f33f20e 100644 --- a/wagtail/wagtailsearch/tests/test_frontend.py +++ b/wagtail/wagtailsearch/tests/test_frontend.py @@ -5,7 +5,7 @@ from django.test import TestCase from django.urls import reverse from wagtail.tests.testapp.models import EventPage -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from wagtail.wagtailsearch.models import Query diff --git a/wagtail/wagtailsearch/tests/test_index_functions.py b/wagtail/wagtailsearch/tests/test_index_functions.py index b2df18ce3..809e5c427 100644 --- a/wagtail/wagtailsearch/tests/test_index_functions.py +++ b/wagtail/wagtailsearch/tests/test_index_functions.py @@ -8,7 +8,7 @@ from django.test import TestCase, override_settings from wagtail.tests.search import models from wagtail.tests.testapp.models import SimplePage from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from wagtail.wagtailsearch import index diff --git a/wagtail/wagtailsearch/views/frontend.py b/wagtail/wagtailsearch/views/frontend.py index 34210a1dd..079cf8ea5 100644 --- a/wagtail/wagtailsearch/views/frontend.py +++ b/wagtail/wagtailsearch/views/frontend.py @@ -5,7 +5,7 @@ from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator from django.http import JsonResponse from django.shortcuts import render -from wagtail.wagtailcore import models +from wagtail.core import models from wagtail.wagtailsearch.models import Query diff --git a/wagtail/wagtailsearch/wagtail_hooks.py b/wagtail/wagtailsearch/wagtail_hooks.py index 1b5b07f7f..e8c6fb57d 100644 --- a/wagtail/wagtailsearch/wagtail_hooks.py +++ b/wagtail/wagtailsearch/wagtail_hooks.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import include, url -from wagtail.wagtailcore import hooks +from wagtail.core import hooks from wagtail.wagtailsearch.urls import admin as admin_urls diff --git a/wagtail/wagtailsites/forms.py b/wagtail/wagtailsites/forms.py index c0f691a05..4d8bf6add 100644 --- a/wagtail/wagtailsites/forms.py +++ b/wagtail/wagtailsites/forms.py @@ -4,7 +4,7 @@ from django import forms from django.utils.translation import ugettext_lazy as _ from wagtail.wagtailadmin.widgets import AdminPageChooser -from wagtail.wagtailcore.models import Site +from wagtail.core.models import Site class SiteForm(forms.ModelForm): diff --git a/wagtail/wagtailsites/tests.py b/wagtail/wagtailsites/tests.py index 2e2fea7cb..0d1545eb0 100644 --- a/wagtail/wagtailsites/tests.py +++ b/wagtail/wagtailsites/tests.py @@ -6,7 +6,7 @@ from django.test import TestCase from django.urls import reverse from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore.models import Page, Site +from wagtail.core.models import Page, Site class TestSiteIndexView(TestCase, WagtailTestUtils): diff --git a/wagtail/wagtailsites/views.py b/wagtail/wagtailsites/views.py index a6172e375..7c7b61e5d 100644 --- a/wagtail/wagtailsites/views.py +++ b/wagtail/wagtailsites/views.py @@ -4,8 +4,8 @@ from django.utils.translation import ugettext_lazy from wagtail.wagtailadmin.views import generic from wagtail.wagtailadmin.viewsets.model import ModelViewSet -from wagtail.wagtailcore.models import Site -from wagtail.wagtailcore.permissions import site_permission_policy +from wagtail.core.models import Site +from wagtail.core.permissions import site_permission_policy from wagtail.wagtailsites.forms import SiteForm diff --git a/wagtail/wagtailsites/wagtail_hooks.py b/wagtail/wagtailsites/wagtail_hooks.py index 80fee8992..b9defe63f 100644 --- a/wagtail/wagtailsites/wagtail_hooks.py +++ b/wagtail/wagtailsites/wagtail_hooks.py @@ -5,8 +5,8 @@ from django.urls import reverse from django.utils.translation import ugettext_lazy as _ from wagtail.wagtailadmin.menu import MenuItem -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.permissions import site_permission_policy +from wagtail.core import hooks +from wagtail.core.permissions import site_permission_policy from .views import SiteViewSet diff --git a/wagtail/wagtailsnippets/blocks.py b/wagtail/wagtailsnippets/blocks.py index 59024f0c0..95c607fff 100644 --- a/wagtail/wagtailsnippets/blocks.py +++ b/wagtail/wagtailsnippets/blocks.py @@ -2,8 +2,8 @@ from __future__ import absolute_import, unicode_literals from django.utils.functional import cached_property -from wagtail.wagtailcore.blocks import ChooserBlock -from wagtail.wagtailcore.utils import resolve_model_string +from wagtail.core.blocks import ChooserBlock +from wagtail.core.utils import resolve_model_string class SnippetChooserBlock(ChooserBlock): diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py index b6cfe037e..30b8d6009 100644 --- a/wagtail/wagtailsnippets/tests.py +++ b/wagtail/wagtailsnippets/tests.py @@ -17,7 +17,7 @@ from wagtail.tests.snippets.models import ( from wagtail.tests.testapp.models import Advert, AdvertWithTabbedInterface, SnippetChooserModel from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailadmin.forms import WagtailAdminModelForm -from wagtail.wagtailcore.models import Page +from wagtail.core.models import Page from wagtail.wagtailsnippets.blocks import SnippetChooserBlock from wagtail.wagtailsnippets.edit_handlers import SnippetChooserPanel from wagtail.wagtailsnippets.models import SNIPPET_MODELS, register_snippet diff --git a/wagtail/wagtailsnippets/wagtail_hooks.py b/wagtail/wagtailsnippets/wagtail_hooks.py index ecaed007d..7c7cbbaf6 100644 --- a/wagtail/wagtailsnippets/wagtail_hooks.py +++ b/wagtail/wagtailsnippets/wagtail_hooks.py @@ -9,7 +9,7 @@ from django.utils.html import format_html from django.utils.translation import ugettext_lazy as _ from wagtail.wagtailadmin.menu import MenuItem -from wagtail.wagtailcore import hooks +from wagtail.core import hooks from wagtail.wagtailsnippets import urls from wagtail.wagtailsnippets.models import get_snippet_models from wagtail.wagtailsnippets.permissions import user_can_edit_snippets diff --git a/wagtail/wagtailusers/forms.py b/wagtail/wagtailusers/forms.py index a8d49fe85..d17e89d4e 100644 --- a/wagtail/wagtailusers/forms.py +++ b/wagtail/wagtailusers/forms.py @@ -16,8 +16,8 @@ from django.utils.translation import ugettext_lazy as _ from wagtail.wagtailadmin.utils import get_available_admin_languages from wagtail.wagtailadmin.widgets import AdminPageChooser -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.models import ( +from wagtail.core import hooks +from wagtail.core.models import ( PAGE_PERMISSION_TYPE_CHOICES, PAGE_PERMISSION_TYPES, GroupPagePermission, Page, UserPagePermissionsProxy) from wagtail.wagtailusers.models import UserProfile diff --git a/wagtail/wagtailusers/templatetags/wagtailusers_tags.py b/wagtail/wagtailusers/templatetags/wagtailusers_tags.py index 661544d97..e364dd4df 100644 --- a/wagtail/wagtailusers/templatetags/wagtailusers_tags.py +++ b/wagtail/wagtailusers/templatetags/wagtailusers_tags.py @@ -4,7 +4,7 @@ import itertools from django import template -from wagtail.wagtailcore import hooks +from wagtail.core import hooks register = template.Library() diff --git a/wagtail/wagtailusers/tests.py b/wagtail/wagtailusers/tests.py index 35b055a78..0285f0194 100644 --- a/wagtail/wagtailusers/tests.py +++ b/wagtail/wagtailusers/tests.py @@ -10,9 +10,9 @@ from django.test import TestCase, override_settings from django.urls import reverse from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME -from wagtail.wagtailcore.models import ( +from wagtail.core import hooks +from wagtail.core.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME +from wagtail.core.models import ( Collection, GroupCollectionPermission, GroupPagePermission, Page) from wagtail.wagtailusers.forms import UserCreationForm, UserEditForm from wagtail.wagtailusers.models import UserProfile diff --git a/wagtail/wagtailusers/utils.py b/wagtail/wagtailusers/utils.py index 784bde50e..4272e0bbd 100644 --- a/wagtail/wagtailusers/utils.py +++ b/wagtail/wagtailusers/utils.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from wagtail.wagtailcore.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME +from wagtail.core.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME delete_user_perm = "{0}.delete_{1}".format(AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME.lower()) diff --git a/wagtail/wagtailusers/views/groups.py b/wagtail/wagtailusers/views/groups.py index 06cb7b195..d1228272a 100644 --- a/wagtail/wagtailusers/views/groups.py +++ b/wagtail/wagtailusers/views/groups.py @@ -5,7 +5,7 @@ from django.utils.translation import ugettext as _ from wagtail.wagtailadmin.views import generic, mixins from wagtail.wagtailadmin.viewsets.model import ModelViewSet -from wagtail.wagtailcore import hooks +from wagtail.core import hooks from wagtail.wagtailusers.forms import GroupForm, GroupPagePermissionFormSet _permission_panel_classes = None diff --git a/wagtail/wagtailusers/views/users.py b/wagtail/wagtailusers/views/users.py index c9d564268..dd2f2c3c6 100644 --- a/wagtail/wagtailusers/views/users.py +++ b/wagtail/wagtailusers/views/users.py @@ -15,8 +15,8 @@ from wagtail.wagtailadmin import messages from wagtail.wagtailadmin.forms import SearchForm from wagtail.wagtailadmin.utils import ( any_permission_required, permission_denied, permission_required) -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME +from wagtail.core import hooks +from wagtail.core.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME from wagtail.wagtailusers.forms import UserCreationForm, UserEditForm from wagtail.wagtailusers.utils import user_can_delete_user diff --git a/wagtail/wagtailusers/wagtail_hooks.py b/wagtail/wagtailusers/wagtail_hooks.py index 988fb542f..514a23038 100644 --- a/wagtail/wagtailusers/wagtail_hooks.py +++ b/wagtail/wagtailusers/wagtail_hooks.py @@ -8,8 +8,8 @@ from django.utils.translation import ugettext_lazy as _ from wagtail.wagtailadmin.menu import MenuItem from wagtail.wagtailadmin.search import SearchArea -from wagtail.wagtailcore import hooks -from wagtail.wagtailcore.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME +from wagtail.core import hooks +from wagtail.core.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME from wagtail.wagtailusers.urls import users from wagtail.wagtailusers.utils import user_can_delete_user from wagtail.wagtailusers.views.groups import GroupViewSet