Renamed wagtail.contrib.wagtailsitemaps to wagtail.contrib.sitemaps

docs/reference/contrib/sitemaps.rst

@@ -4,7 +4,7 @@ Sitemap generator
 =================
 
 This document describes how to create XML sitemaps for your Wagtail website
-using the ``wagtail.contrib.wagtailsitemaps`` module.
+using the ``wagtail.contrib.sitemaps`` module.
 
 
 .. note::
@@ -12,9 +12,9 @@ using the ``wagtail.contrib.wagtailsitemaps`` module.
     As of Wagtail 1.10 the Django contrib sitemap app is used to generate
     sitemaps.  However since Wagtail requires the Site instance to be available
     during the sitemap generation you will have to use the views from the
-    ``wagtail.contrib.wagtailsitemaps.views`` module instead of the views
-    provided by Django (``django.contrib.sitemaps.views``). 
-    
+    ``wagtail.contrib.sitemaps.views`` module instead of the views
+    provided by Django (``django.contrib.sitemaps.views``).
+
     The usage of these views is otherwise identical, which means that
     customisation and caching of the sitemaps are done using the default Django
     patterns.  See the Django documentation for in-depth information.
@@ -37,12 +37,12 @@ Django settings file:
 
 
 Then, in ``urls.py``, you need to add a link to the
-``wagtail.contrib.wagtailsitemaps.views.sitemap`` view which generates the
+``wagtail.contrib.sitemaps.views.sitemap`` view which generates the
 sitemap:
 
 .. code-block:: python
 
-    from wagtail.contrib.wagtailsitemaps.views import sitemap
+    from wagtail.contrib.sitemaps.views import sitemap
 
     urlpatterns = [
         ...

wagtail/contrib/sitemaps/__init__.py

@@ -0,0 +1,4 @@
+from .sitemap_generator import Sitemap  # noqa
+
+
+default_app_config = 'wagtail.contrib.sitemaps.apps.WagtailSitemapsAppConfig'

wagtail/contrib/wagtailsitemaps/apps.py → wagtail/contrib/sitemaps/apps.py

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

wagtail/contrib/wagtailsitemaps/__init__.py

@@ -1,4 +0,0 @@
-from .sitemap_generator import Sitemap  # noqa
-
-
-default_app_config = 'wagtail.contrib.wagtailsitemaps.apps.WagtailSitemapsAppConfig'

wagtail/tests/urls.py

@@ -4,8 +4,8 @@ from django.conf.urls import include, url
 
 from wagtail.api.v2.endpoints import PagesAPIEndpoint
 from wagtail.api.v2.router import WagtailAPIRouter
-from wagtail.contrib.wagtailsitemaps import views as sitemaps_views
-from wagtail.contrib.wagtailsitemaps import Sitemap
+from wagtail.contrib.sitemaps import views as sitemaps_views
+from wagtail.contrib.sitemaps import Sitemap
 from wagtail.tests.testapp import urls as testapp_urls
 from wagtail.admin import urls as wagtailadmin_urls
 from wagtail.core import urls as wagtail_urls