From b3a6b7f55f27fa955dac3860960238cee962731d Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 12 Sep 2018 21:18:15 +0100
Subject: [PATCH] Update imports of wagtail.admin.forms to use more specific
 sub-modules

---
 wagtail/admin/edit_handlers.py             | 6 +++---
 wagtail/admin/search.py                    | 2 +-
 wagtail/admin/tests/test_forms.py          | 2 +-
 wagtail/admin/views/account.py             | 6 +++---
 wagtail/admin/views/chooser.py             | 3 ++-
 wagtail/admin/views/collection_privacy.py  | 2 +-
 wagtail/admin/views/collections.py         | 2 +-
 wagtail/admin/views/mixins.py              | 2 +-
 wagtail/admin/views/page_privacy.py        | 2 +-
 wagtail/admin/views/pages.py               | 3 ++-
 wagtail/contrib/redirects/views.py         | 2 +-
 wagtail/contrib/search_promotions/views.py | 2 +-
 wagtail/contrib/styleguide/views.py        | 2 +-
 wagtail/documents/forms.py                 | 2 +-
 wagtail/documents/views/chooser.py         | 2 +-
 wagtail/documents/views/documents.py       | 2 +-
 wagtail/images/forms.py                    | 2 +-
 wagtail/images/views/chooser.py            | 2 +-
 wagtail/images/views/images.py             | 2 +-
 wagtail/search/views/queries.py            | 2 +-
 wagtail/snippets/views/chooser.py          | 2 +-
 wagtail/snippets/views/snippets.py         | 2 +-
 wagtail/users/views/users.py               | 2 +-
 23 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/wagtail/admin/edit_handlers.py b/wagtail/admin/edit_handlers.py
index 66d17130d..f3fc1a3e4 100644
--- a/wagtail/admin/edit_handlers.py
+++ b/wagtail/admin/edit_handlers.py
@@ -21,9 +21,9 @@ from wagtail.utils.decorators import cached_classmethod
 # DIRECT_FORM_FIELD_OVERRIDES, FORM_FIELD_OVERRIDES are imported for backwards
 # compatibility, as people are likely importing them from here and then
 # appending their own overrides
-from .forms import (  # NOQA
-    DIRECT_FORM_FIELD_OVERRIDES, FORM_FIELD_OVERRIDES, WagtailAdminModelForm, WagtailAdminPageForm,
-    formfield_for_dbfield)
+from .forms.models import (  # NOQA
+    DIRECT_FORM_FIELD_OVERRIDES, FORM_FIELD_OVERRIDES, WagtailAdminModelForm, formfield_for_dbfield)
+from .forms.pages import WagtailAdminPageForm
 
 
 def widget_with_script(widget, script):
diff --git a/wagtail/admin/search.py b/wagtail/admin/search.py
index b462b0d24..96eb1c83f 100644
--- a/wagtail/admin/search.py
+++ b/wagtail/admin/search.py
@@ -5,7 +5,7 @@ from django.utils.functional import cached_property, total_ordering
 from django.utils.safestring import mark_safe
 from django.utils.text import slugify
 
-from wagtail.admin.forms import SearchForm
+from wagtail.admin.forms.search import SearchForm
 from wagtail.core import hooks
 
 
diff --git a/wagtail/admin/tests/test_forms.py b/wagtail/admin/tests/test_forms.py
index 065a8d07c..40c0e4b7e 100644
--- a/wagtail/admin/tests/test_forms.py
+++ b/wagtail/admin/tests/test_forms.py
@@ -1,7 +1,7 @@
 from django.forms.fields import CharField
 from django.test import TestCase
 
-from wagtail.admin.forms import LoginForm
+from wagtail.admin.forms.auth import LoginForm
 
 
 class CustomLoginForm(LoginForm):
diff --git a/wagtail/admin/views/account.py b/wagtail/admin/views/account.py
index 2a385b324..d04b813b6 100644
--- a/wagtail/admin/views/account.py
+++ b/wagtail/admin/views/account.py
@@ -9,7 +9,7 @@ from django.urls import reverse, reverse_lazy
 from django.utils.translation import ugettext as _
 from django.utils.translation import activate
 
-from wagtail.admin import forms
+from wagtail.admin.forms.auth import LoginForm, PasswordResetForm
 from wagtail.core import hooks
 from wagtail.users.forms import (
     AvatarPreferencesForm, CurrentTimeZoneForm, EmailForm, NotificationPreferencesForm, PreferredLanguageForm)
@@ -22,7 +22,7 @@ def get_user_login_form():
     if hasattr(settings, form_setting):
         return get_custom_form(form_setting)
     else:
-        return forms.LoginForm
+        return LoginForm
 
 
 # Helper functions to check password management settings to enable/disable views as appropriate.
@@ -112,7 +112,7 @@ class PasswordResetView(PasswordResetEnabledViewMixin, auth_views.PasswordResetV
     template_name = 'wagtailadmin/account/password_reset/form.html'
     email_template_name = 'wagtailadmin/account/password_reset/email.txt'
     subject_template_name = 'wagtailadmin/account/password_reset/email_subject.txt'
-    form_class = forms.PasswordResetForm
+    form_class = PasswordResetForm
     success_url = reverse_lazy('wagtailadmin_password_reset_done')
 
 
diff --git a/wagtail/admin/views/chooser.py b/wagtail/admin/views/chooser.py
index a83993511..ee7437399 100644
--- a/wagtail/admin/views/chooser.py
+++ b/wagtail/admin/views/chooser.py
@@ -1,7 +1,8 @@
 from django.http import Http404
 from django.shortcuts import get_object_or_404, render
 
-from wagtail.admin.forms import EmailLinkChooserForm, ExternalLinkChooserForm, SearchForm
+from wagtail.admin.forms.choosers import EmailLinkChooserForm, ExternalLinkChooserForm
+from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.modal_workflow import render_modal_workflow
 from wagtail.core import hooks
 from wagtail.core.models import Page, UserPagePermissionsProxy
diff --git a/wagtail/admin/views/collection_privacy.py b/wagtail/admin/views/collection_privacy.py
index dffa841ee..154ec9b20 100644
--- a/wagtail/admin/views/collection_privacy.py
+++ b/wagtail/admin/views/collection_privacy.py
@@ -1,7 +1,7 @@
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404
 
-from wagtail.admin.forms import CollectionViewRestrictionForm
+from wagtail.admin.forms.collections import CollectionViewRestrictionForm
 from wagtail.admin.modal_workflow import render_modal_workflow
 from wagtail.core.models import Collection, CollectionViewRestriction
 from wagtail.core.permissions import collection_permission_policy
diff --git a/wagtail/admin/views/collections.py b/wagtail/admin/views/collections.py
index b3d794e5f..cb6f91ccf 100644
--- a/wagtail/admin/views/collections.py
+++ b/wagtail/admin/views/collections.py
@@ -3,7 +3,7 @@ from django.shortcuts import get_object_or_404, redirect
 from django.utils.translation import ugettext_lazy
 
 from wagtail.admin import messages
-from wagtail.admin.forms import CollectionForm
+from wagtail.admin.forms.collections import CollectionForm
 from wagtail.admin.views.generic import CreateView, DeleteView, EditView, IndexView
 from wagtail.core import hooks
 from wagtail.core.models import Collection
diff --git a/wagtail/admin/views/mixins.py b/wagtail/admin/views/mixins.py
index 098729958..e4983442b 100644
--- a/wagtail/admin/views/mixins.py
+++ b/wagtail/admin/views/mixins.py
@@ -1,6 +1,6 @@
 from django.utils.translation import ugettext as _
 
-from wagtail.admin.forms import SearchForm
+from wagtail.admin.forms.search import SearchForm
 from wagtail.search.backends import get_search_backend
 from wagtail.search.index import class_is_indexed
 
diff --git a/wagtail/admin/views/page_privacy.py b/wagtail/admin/views/page_privacy.py
index c744f124a..d1ce088ec 100644
--- a/wagtail/admin/views/page_privacy.py
+++ b/wagtail/admin/views/page_privacy.py
@@ -1,7 +1,7 @@
 from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404
 
-from wagtail.admin.forms import PageViewRestrictionForm
+from wagtail.admin.forms.pages import PageViewRestrictionForm
 from wagtail.admin.modal_workflow import render_modal_workflow
 from wagtail.core.models import Page, PageViewRestriction
 
diff --git a/wagtail/admin/views/pages.py b/wagtail/admin/views/pages.py
index e8ac2d078..f3737c557 100644
--- a/wagtail/admin/views/pages.py
+++ b/wagtail/admin/views/pages.py
@@ -18,7 +18,8 @@ from django.views.decorators.vary import vary_on_headers
 from django.views.generic import View
 
 from wagtail.admin import messages, signals
-from wagtail.admin.forms import CopyForm, SearchForm
+from wagtail.admin.forms.pages import CopyForm
+from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.navigation import get_explorable_root_page
 from wagtail.admin.utils import send_notification, user_has_any_page_permission, user_passes_test
 from wagtail.core import hooks
diff --git a/wagtail/contrib/redirects/views.py b/wagtail/contrib/redirects/views.py
index c5ac6d871..e8b1c971d 100644
--- a/wagtail/contrib/redirects/views.py
+++ b/wagtail/contrib/redirects/views.py
@@ -5,7 +5,7 @@ from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers
 
 from wagtail.admin import messages
-from wagtail.admin.forms import SearchForm
+from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.utils import PermissionPolicyChecker, permission_denied
 from wagtail.contrib.redirects import models
 from wagtail.contrib.redirects.forms import RedirectForm
diff --git a/wagtail/contrib/search_promotions/views.py b/wagtail/contrib/search_promotions/views.py
index 7b711a567..b4cb73360 100644
--- a/wagtail/contrib/search_promotions/views.py
+++ b/wagtail/contrib/search_promotions/views.py
@@ -4,7 +4,7 @@ from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers
 
 from wagtail.admin import messages
-from wagtail.admin.forms import SearchForm
+from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.utils import any_permission_required, permission_required
 from wagtail.contrib.search_promotions import forms
 from wagtail.search import forms as search_forms
diff --git a/wagtail/contrib/styleguide/views.py b/wagtail/contrib/styleguide/views.py
index 9b2d7e7a9..fffb23ca0 100644
--- a/wagtail/contrib/styleguide/views.py
+++ b/wagtail/contrib/styleguide/views.py
@@ -5,7 +5,7 @@ from django.shortcuts import render
 from django.utils.translation import ugettext as _
 
 from wagtail.admin import messages
-from wagtail.admin.forms import SearchForm
+from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.rich_text import get_rich_text_editor_widget
 from wagtail.admin.widgets import (
     AdminAutoHeightTextInput, AdminDateInput, AdminDateTimeInput, AdminPageChooser, AdminTimeInput)
diff --git a/wagtail/documents/forms.py b/wagtail/documents/forms.py
index 6012336d5..9617d5139 100644
--- a/wagtail/documents/forms.py
+++ b/wagtail/documents/forms.py
@@ -3,7 +3,7 @@ from django.forms.models import modelform_factory
 from django.utils.translation import ugettext_lazy as _
 
 from wagtail.admin import widgets
-from wagtail.admin.forms import (
+from wagtail.admin.forms.collections import (
     BaseCollectionMemberForm, collection_member_permission_formset_factory)
 from wagtail.documents.models import Document
 from wagtail.documents.permissions import permission_policy as documents_permission_policy
diff --git a/wagtail/documents/views/chooser.py b/wagtail/documents/views/chooser.py
index 504025304..01d5401ab 100644
--- a/wagtail/documents/views/chooser.py
+++ b/wagtail/documents/views/chooser.py
@@ -2,7 +2,7 @@ from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 from django.utils.translation import ugettext as _
 
-from wagtail.admin.forms import SearchForm
+from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.modal_workflow import render_modal_workflow
 from wagtail.admin.utils import PermissionPolicyChecker
 from wagtail.core import hooks
diff --git a/wagtail/documents/views/documents.py b/wagtail/documents/views/documents.py
index cbf30a5f3..a8f73dc18 100644
--- a/wagtail/documents/views/documents.py
+++ b/wagtail/documents/views/documents.py
@@ -6,7 +6,7 @@ from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers
 
 from wagtail.admin import messages
-from wagtail.admin.forms import SearchForm
+from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.utils import PermissionPolicyChecker, permission_denied, popular_tags_for_model
 from wagtail.core.models import Collection
 from wagtail.documents.forms import get_document_form
diff --git a/wagtail/images/forms.py b/wagtail/images/forms.py
index 3b87cc00f..0660e0fc4 100644
--- a/wagtail/images/forms.py
+++ b/wagtail/images/forms.py
@@ -4,7 +4,7 @@ from django.utils.text import capfirst
 from django.utils.translation import ugettext as _
 
 from wagtail.admin import widgets
-from wagtail.admin.forms import (
+from wagtail.admin.forms.collections import (
     BaseCollectionMemberForm, collection_member_permission_formset_factory)
 from wagtail.images.fields import WagtailImageField
 from wagtail.images.formats import get_image_formats
diff --git a/wagtail/images/views/chooser.py b/wagtail/images/views/chooser.py
index 8ac653b0d..edf403cce 100644
--- a/wagtail/images/views/chooser.py
+++ b/wagtail/images/views/chooser.py
@@ -2,7 +2,7 @@ from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 from django.utils.translation import ugettext as _
 
-from wagtail.admin.forms import SearchForm
+from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.modal_workflow import render_modal_workflow
 from wagtail.admin.utils import PermissionPolicyChecker, popular_tags_for_model
 from wagtail.core import hooks
diff --git a/wagtail/images/views/images.py b/wagtail/images/views/images.py
index 71a29d88f..0edf81edd 100644
--- a/wagtail/images/views/images.py
+++ b/wagtail/images/views/images.py
@@ -8,7 +8,7 @@ from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers
 
 from wagtail.admin import messages
-from wagtail.admin.forms import SearchForm
+from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.utils import PermissionPolicyChecker, permission_denied, popular_tags_for_model
 from wagtail.core.models import Collection, Site
 from wagtail.images import get_image_model
diff --git a/wagtail/search/views/queries.py b/wagtail/search/views/queries.py
index 80a7a4370..21c9795e3 100644
--- a/wagtail/search/views/queries.py
+++ b/wagtail/search/views/queries.py
@@ -1,6 +1,6 @@
 from django.shortcuts import render
 
-from wagtail.admin.forms import SearchForm
+from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.modal_workflow import render_modal_workflow
 from wagtail.search import models
 from wagtail.search.utils import normalise_query_string
diff --git a/wagtail/snippets/views/chooser.py b/wagtail/snippets/views/chooser.py
index 00d0ba1be..71bc19aac 100644
--- a/wagtail/snippets/views/chooser.py
+++ b/wagtail/snippets/views/chooser.py
@@ -3,7 +3,7 @@ from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 from django.utils.translation import ugettext as _
 
-from wagtail.admin.forms import SearchForm
+from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.modal_workflow import render_modal_workflow
 from wagtail.search.backends import get_search_backend
 from wagtail.search.index import class_is_indexed
diff --git a/wagtail/snippets/views/snippets.py b/wagtail/snippets/views/snippets.py
index c41223db2..3b44853ac 100644
--- a/wagtail/snippets/views/snippets.py
+++ b/wagtail/snippets/views/snippets.py
@@ -10,7 +10,7 @@ from django.utils.translation import ugettext as _
 
 from wagtail.admin import messages
 from wagtail.admin.edit_handlers import ObjectList, extract_panel_definitions_from_model_class
-from wagtail.admin.forms import SearchForm
+from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.utils import permission_denied
 from wagtail.search.backends import get_search_backend
 from wagtail.search.index import class_is_indexed
diff --git a/wagtail/users/views/users.py b/wagtail/users/views/users.py
index e61ffa0d4..d30f30f4b 100644
--- a/wagtail/users/views/users.py
+++ b/wagtail/users/views/users.py
@@ -7,7 +7,7 @@ from django.utils.translation import ugettext as _
 from django.views.decorators.vary import vary_on_headers
 
 from wagtail.admin import messages
-from wagtail.admin.forms import SearchForm
+from wagtail.admin.forms.search import SearchForm
 from wagtail.admin.utils import any_permission_required, permission_denied, permission_required
 from wagtail.core import hooks
 from wagtail.core.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME