Renamed wagtail.wagtailredirects to wagtail.contrib.redirects

Conflicts:
	docs/advanced_topics/settings.rst
	docs/getting_started/integrating_into_django.rst
	wagtail/contrib/redirects/forms.py
	wagtail/contrib/redirects/permissions.py
	wagtail/contrib/redirects/tests.py
	wagtail/contrib/redirects/views.py
	wagtail/contrib/redirects/wagtail_hooks.py
	wagtail/project_template/project_name/settings/base.py
	wagtail/tests/settings.py

.tx/config

@@ -32,8 +32,8 @@ source_lang = en
 type = PO
 
 [wagtail.wagtailredirects]
-file_filter = wagtail/wagtailredirects/locale/<lang>/LC_MESSAGES/django.po
-source_file = wagtail/wagtailredirects/locale/en/LC_MESSAGES/django.po
+file_filter = wagtail/contrib/redirects/locale/<lang>/LC_MESSAGES/django.po
+source_file = wagtail/contrib/redirects/locale/en/LC_MESSAGES/django.po
 source_lang = en
 type = PO
 

docs/advanced_topics/settings.rst

@@ -39,7 +39,7 @@ Middleware (``settings.py``)
 
     'wagtail.core.middleware.SiteMiddleware',
 
-    'wagtail.wagtailredirects.middleware.RedirectMiddleware',
+    'wagtail.contrib.redirects.middleware.RedirectMiddleware',
   ]
 
 Wagtail requires several common Django middleware modules to work and cover basic security. Wagtail provides its own middleware to cover these tasks:
@@ -61,7 +61,7 @@ Apps (``settings.py``)
     'myapp',  # your own app
 
     'wagtail.contrib.forms',
-    'wagtail.wagtailredirects',
+    'wagtail.contrib.redirects',
     'wagtail.embeds',
     'wagtail.sites',
     'wagtail.users',
@@ -503,7 +503,7 @@ These two files should reside in your project directory (``myproject/myproject/`
       'myapp',
 
       'wagtail.contrib.forms',
-      'wagtail.wagtailredirects',
+      'wagtail.contrib.redirects',
       'wagtail.embeds',
       'wagtail.sites',
       'wagtail.users',
@@ -535,7 +535,7 @@ These two files should reside in your project directory (``myproject/myproject/`
       'django.middleware.security.SecurityMiddleware',
 
       'wagtail.core.middleware.SiteMiddleware',
-      'wagtail.wagtailredirects.middleware.RedirectMiddleware',
+      'wagtail.contrib.redirects.middleware.RedirectMiddleware',
   ]
 
   ROOT_URLCONF = 'myproject.urls'

docs/getting_started/integrating_into_django.rst

@@ -21,7 +21,7 @@ In your settings file, add the following apps to ``INSTALLED_APPS``:
 .. code-block:: python
 
     'wagtail.contrib.forms',
-    'wagtail.wagtailredirects',
+    'wagtail.contrib.redirects',
     'wagtail.embeds',
     'wagtail.sites',
     'wagtail.users',
@@ -40,7 +40,7 @@ Add the following entries to ``MIDDLEWARE``:
 .. code-block:: python
 
     'wagtail.core.middleware.SiteMiddleware',
-    'wagtail.wagtailredirects.middleware.RedirectMiddleware',
+    'wagtail.contrib.redirects.middleware.RedirectMiddleware',
 
 Add a ``STATIC_ROOT`` setting, if your project does not have one already:
 

wagtail/contrib/redirects/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'wagtail.contrib.redirects.apps.WagtailRedirectsAppConfig'

wagtail/contrib/redirects/apps.py

@@ -4,6 +4,6 @@ from django.apps import AppConfig
 
 
 class WagtailRedirectsAppConfig(AppConfig):
-    name = 'wagtail.wagtailredirects'
+    name = 'wagtail.contrib.redirects'
     label = 'wagtailredirects'
     verbose_name = "Wagtail redirects"

wagtail/contrib/redirects/forms.py

@@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from wagtail.admin.widgets import AdminPageChooser
 from wagtail.core.models import Site
-from wagtail.wagtailredirects.models import Redirect
+from wagtail.contrib.redirects.models import Redirect
 
 
 class RedirectForm(forms.ModelForm):

wagtail/contrib/redirects/middleware.py

@@ -6,7 +6,7 @@ from django import http
 from django.utils.deprecation import MiddlewareMixin
 from django.utils.encoding import uri_to_iri
 
-from wagtail.wagtailredirects import models
+from wagtail.contrib.redirects import models
 
 
 def _get_redirect(request, path):

wagtail/contrib/redirects/permissions.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 from wagtail.core.permission_policies import ModelPermissionPolicy
-from wagtail.wagtailredirects.models import Redirect
+from wagtail.contrib.redirects.models import Redirect
 
 permission_policy = ModelPermissionPolicy(Redirect)

wagtail/contrib/redirects/tests.py

@@ -6,7 +6,7 @@ from django.urls import reverse
 
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.core.models import Page, Site
-from wagtail.wagtailredirects import models
+from wagtail.contrib.redirects import models
 
 
 @override_settings(ALLOWED_HOSTS=['testserver', 'localhost', 'test.example.com', 'other.example.com'])

wagtail/contrib/redirects/urls.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 from django.conf.urls import url
 
-from wagtail.wagtailredirects import views
+from wagtail.contrib.redirects import views
 
 app_name = 'wagtailredirects'
 urlpatterns = [

wagtail/contrib/redirects/views.py

@@ -9,9 +9,9 @@ from wagtail.utils.pagination import paginate
 from wagtail.admin import messages
 from wagtail.admin.forms import SearchForm
 from wagtail.admin.utils import PermissionPolicyChecker, permission_denied
-from wagtail.wagtailredirects import models
-from wagtail.wagtailredirects.forms import RedirectForm
-from wagtail.wagtailredirects.permissions import permission_policy
+from wagtail.contrib.redirects import models
+from wagtail.contrib.redirects.forms import RedirectForm
+from wagtail.contrib.redirects.permissions import permission_policy
 
 permission_checker = PermissionPolicyChecker(permission_policy)
 

wagtail/contrib/redirects/wagtail_hooks.py

@@ -7,8 +7,8 @@ from django.utils.translation import ugettext_lazy as _
 
 from wagtail.admin.menu import MenuItem
 from wagtail.core import hooks
-from wagtail.wagtailredirects import urls
-from wagtail.wagtailredirects.permissions import permission_policy
+from wagtail.contrib.redirects import urls
+from wagtail.contrib.redirects.permissions import permission_policy
 
 
 @hooks.register('register_admin_urls')

wagtail/project_template/project_name/settings/base.py

@@ -30,7 +30,7 @@ INSTALLED_APPS = [
     'search',
 
     'wagtail.contrib.forms',
-    'wagtail.wagtailredirects',
+    'wagtail.contrib.redirects',
     'wagtail.embeds',
     'wagtail.sites',
     'wagtail.users',
@@ -62,7 +62,7 @@ MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
 
     'wagtail.core.middleware.SiteMiddleware',
-    'wagtail.wagtailredirects.middleware.RedirectMiddleware',
+    'wagtail.contrib.redirects.middleware.RedirectMiddleware',
 ]
 
 ROOT_URLCONF = '{{ project_name }}.urls'

wagtail/tests/settings.py

@@ -95,14 +95,14 @@ MIDDLEWARE = (
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 
     'wagtail.core.middleware.SiteMiddleware',
-    'wagtail.wagtailredirects.middleware.RedirectMiddleware',
+    'wagtail.contrib.redirects.middleware.RedirectMiddleware',
 )
 
 INSTALLED_APPS = (
     # Install wagtailredirects with its appconfig
     # Theres nothing special about wagtailredirects, we just need to have one
     # app which uses AppConfigs to test that hooks load properly
-    'wagtail.wagtailredirects.apps.WagtailRedirectsAppConfig',
+    'wagtail.contrib.redirects.apps.WagtailRedirectsAppConfig',
 
     'wagtail.tests.testapp',
     'wagtail.tests.demosite',

wagtail/wagtailredirects/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'wagtail.wagtailredirects.apps.WagtailRedirectsAppConfig'