Rename wagtail.wagtailusers to wagtail.users

Conflicts:
	wagtail/admin/tests/test_pages_views.py
	wagtail/admin/utils.py
	wagtail/admin/views/account.py
	wagtail/users/views/groups.py
	wagtail/users/views/users.py
	wagtail/users/wagtail_hooks.py

.tx/config

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

docs/advanced_topics/customisation/custom_user_models.rst

@@ -30,7 +30,7 @@ Create your custom user create and edit forms in your app:
   from django import forms
   from django.utils.translation import ugettext_lazy as _
 
-  from wagtail.wagtailusers.forms import UserEditForm, UserCreationForm
+  from wagtail.users.forms import UserEditForm, UserCreationForm
 
   from users.models import MembershipStatus
 

docs/advanced_topics/settings.rst

@@ -64,7 +64,7 @@ Apps (``settings.py``)
     'wagtail.wagtailredirects',
     'wagtail.embeds',
     'wagtail.sites',
-    'wagtail.wagtailusers',
+    'wagtail.users',
     'wagtail.snippets',
     'wagtail.documents',
     'wagtail.images',
@@ -506,7 +506,7 @@ These two files should reside in your project directory (``myproject/myproject/`
       'wagtail.wagtailredirects',
       'wagtail.embeds',
       'wagtail.sites',
-      'wagtail.wagtailusers',
+      'wagtail.users',
       'wagtail.snippets',
       'wagtail.documents',
       'wagtail.images',

docs/getting_started/integrating_into_django.rst

@@ -24,7 +24,7 @@ In your settings file, add the following apps to ``INSTALLED_APPS``:
     'wagtail.wagtailredirects',
     'wagtail.embeds',
     'wagtail.sites',
-    'wagtail.wagtailusers',
+    'wagtail.users',
     'wagtail.snippets',
     'wagtail.documents',
     'wagtail.images',

gulpfile.js/config.js

@@ -28,7 +28,7 @@ var apps = [
     new App('wagtail/embeds'),
     new App('wagtail/images'),
     new App('wagtail/snippets'),
-    new App('wagtail/wagtailusers'),
+    new App('wagtail/users'),
     new App('wagtail/contrib/wagtailstyleguide'),
     new App('wagtail/contrib/settings', {
         'appName': 'wagtailsettings',

wagtail/admin/tests/test_account_management.py

@@ -10,7 +10,7 @@ from django.urls import reverse
 from wagtail.tests.utils import WagtailTestUtils
 from wagtail.admin.utils import (
     WAGTAILADMIN_PROVIDED_LANGUAGES, get_available_admin_languages)
-from wagtail.wagtailusers.models import UserProfile
+from wagtail.users.models import UserProfile
 
 
 class TestAuthentication(TestCase, WagtailTestUtils):

wagtail/admin/tests/test_pages_views.py

@@ -31,7 +31,7 @@ from wagtail.admin.views.pages import PreviewOnEdit
 from wagtail.core.models import GroupPagePermission, Page, PageRevision, Site
 from wagtail.core.signals import page_published, page_unpublished
 from wagtail.search.index import SearchField
-from wagtail.wagtailusers.models import UserProfile
+from wagtail.users.models import UserProfile
 
 
 def submittable_timestamp(timestamp):

wagtail/admin/utils.py

@@ -18,7 +18,7 @@ from modelcluster.fields import ParentalKey
 from taggit.models import Tag
 
 from wagtail.core.models import GroupPagePermission, Page, PageRevision
-from wagtail.wagtailusers.models import UserProfile
+from wagtail.users.models import UserProfile
 
 logger = logging.getLogger('wagtail.admin')
 

wagtail/admin/views/account.py

@@ -17,8 +17,8 @@ from django.views.decorators.debug import sensitive_post_parameters
 from wagtail.admin import forms
 from wagtail.admin.utils import get_available_admin_languages
 from wagtail.core.models import UserPagePermissionsProxy
-from wagtail.wagtailusers.forms import NotificationPreferencesForm, PreferredLanguageForm
+from wagtail.users.forms import NotificationPreferencesForm, PreferredLanguageForm
-from wagtail.wagtailusers.models import UserProfile
+from wagtail.users.models import UserProfile
 
 
 # Helper functions to check password management settings to enable/disable views as appropriate.

wagtail/project_template/project_name/settings/base.py

@@ -33,7 +33,7 @@ INSTALLED_APPS = [
     'wagtail.wagtailredirects',
     'wagtail.embeds',
     'wagtail.sites',
-    'wagtail.wagtailusers',
+    'wagtail.users',
     'wagtail.snippets',
     'wagtail.documents',
     'wagtail.images',

wagtail/tests/settings.py

@@ -123,7 +123,7 @@ INSTALLED_APPS = (
     'wagtail.embeds',
     'wagtail.images',
     'wagtail.sites',
-    'wagtail.wagtailusers',
+    'wagtail.users',
     'wagtail.snippets',
     'wagtail.documents',
     'wagtail.admin',

wagtail/users/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'wagtail.users.apps.WagtailUsersAppConfig'

wagtail/users/apps.py

@@ -4,6 +4,6 @@ from django.apps import AppConfig
 
 
 class WagtailUsersAppConfig(AppConfig):
-    name = 'wagtail.wagtailusers'
+    name = 'wagtail.users'
     label = 'wagtailusers'
     verbose_name = "Wagtail users"

wagtail/users/forms.py

@@ -20,7 +20,7 @@ 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
+from wagtail.users.models import UserProfile
 
 User = get_user_model()