Views cleanup

wagtail/contrib/wagtailstyleguide/views.py

@@ -7,12 +7,12 @@ from django.contrib.auth.decorators import permission_required
 from wagtail.wagtailadmin.forms import SearchForm
 
 
-CHOICES = (
-    ('choice1', 'choice 1'),
-    ('choice2', 'choice 2'),
-)
-
 class ExampleForm(forms.Form):
+    CHOICES = (
+        ('choice1', 'choice 1'),
+        ('choice2', 'choice 2'),
+    )
+
     text = forms.CharField(required=True, help_text="help text")
     url = forms.URLField(required=True)
     email = forms.EmailField(max_length=254)
@@ -21,6 +21,7 @@ class ExampleForm(forms.Form):
     select = forms.ChoiceField(choices=CHOICES)
     boolean = forms.BooleanField(required=False)
 
+
 @permission_required('wagtailadmin.access_admin')
 def index(request):
 
@@ -28,15 +29,15 @@ def index(request):
 
     example_form = ExampleForm()
 
-    messages.success(request, _("Success message"), buttons = [
+    messages.success(request, _("Success message"), buttons=[
         messages.button('', _('View live')),
         messages.button('', _('Edit'))
     ])
-    messages.warning(request, _("Warning message"), buttons = [
+    messages.warning(request, _("Warning message"), buttons=[
         messages.button('', _('View live')),
         messages.button('', _('Edit'))
     ])
-    messages.error(request, _("Error message"), buttons = [
+    messages.error(request, _("Error message"), buttons=[
         messages.button('', _('View live')),
         messages.button('', _('Edit'))
     ])
@@ -51,7 +52,6 @@ def index(request):
             'num_pages': 10,
         },
     }
-   
 
     return render(request, 'wagtailstyleguide/base.html', {
         'search_form': form,

wagtail/wagtailadmin/messages.py

@@ -1,26 +1,33 @@
 from django.contrib import messages
 from django.template.loader import render_to_string
 
+
 def render(message, buttons):
     return render_to_string('wagtailadmin/shared/messages.html', {
         'message': message,
-        'buttons': buttons
+        'buttons': buttons,
     })
 
-def debug(request, message, buttons = None):
+
+def debug(request, message, buttons=None):
     return messages.debug(request, render(message, buttons))
 
-def info(request, message, buttons = None):
+
+def info(request, message, buttons=None):
     return messages.info(request, render(message, buttons))
 
-def success(request, message, buttons = None):
+
+def success(request, message, buttons=None):
     return messages.success(request, render(message, buttons))
 
-def warning(request, message, buttons = None):
+
+def warning(request, message, buttons=None):
     return messages.warning(request, render(message, buttons))
 
-def error(request, message, buttons = None):
+
+def error(request, message, buttons=None):
     return messages.error(request, render(message, buttons))
 
+
 def button(url, text):
     return url, text

wagtail/wagtailadmin/views/pages.py

@@ -3,7 +3,6 @@ import warnings
 from django.http import Http404, HttpResponse
 from django.shortcuts import render, redirect, get_object_or_404
 from django.core.exceptions import ValidationError, PermissionDenied
-#from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.decorators import permission_required
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
@@ -327,12 +326,12 @@ def edit(request, page_id):
 
             # Notifications
             if is_publishing:
-                messages.success(request, _("Page '{0}' published.").format(page.title), buttons = [
+                messages.success(request, _("Page '{0}' published.").format(page.title), buttons=[
                     messages.button(page.url, _('View live')),
                     messages.button(reverse('wagtailadmin_pages_edit', args=(page_id,)), _('Edit'))
                 ])
             elif is_submitting:
-                messages.success(request, _("Page '{0}' submitted for moderation.").format(page.title), buttons = [
+                messages.success(request, _("Page '{0}' submitted for moderation.").format(page.title), buttons=[
                     messages.button(reverse('wagtailadmin_pages_view_draft', args=(page_id,)), _('View draft')),
                     messages.button(reverse('wagtailadmin_pages_edit', args=(page_id,)), _('Edit'))
                 ])

wagtail/wagtaildocs/views/documents.py

@@ -13,6 +13,7 @@ from wagtail.wagtailadmin import messages
 from wagtail.wagtaildocs.models import Document
 from wagtail.wagtaildocs.forms import DocumentForm
 
+
 @permission_required('wagtaildocs.add_document')
 @vary_on_headers('X-Requested-With')
 def index(request):
@@ -88,7 +89,7 @@ def add(request):
             for backend in get_search_backends():
                 backend.add(doc)
 
-            messages.success(request, _("Document '{0}' added.").format(doc.title), buttons = [
+            messages.success(request, _("Document '{0}' added.").format(doc.title), buttons=[
                 messages.button(reverse('wagtaildocs_edit_document', args=(doc.id,)), _('Edit'))
             ])
             return redirect('wagtaildocs_index')
@@ -124,7 +125,7 @@ def edit(request, document_id):
             for backend in get_search_backends():
                 backend.add(doc)
 
-            messages.success(request, _("Document '{0}' updated").format(doc.title), buttons = [
+            messages.success(request, _("Document '{0}' updated").format(doc.title), buttons=[
                 messages.button(reverse('wagtaildocs_edit_document', args=(doc.id,)), _('Edit'))
             ])
             return redirect('wagtaildocs_index')

wagtail/wagtailimages/views/images.py

@@ -103,7 +103,7 @@ def edit(request, image_id):
             for backend in get_search_backends():
                 backend.add(image)
 
-            messages.success(request, _("Image '{0}' updated.").format(image.title), buttons = [
+            messages.success(request, _("Image '{0}' updated.").format(image.title), buttons=[
                 messages.button(reverse('wagtailimages_edit_image', args=(image.id,)), _('Edit again'))
             ])
             return redirect('wagtailimages_index')
@@ -230,7 +230,7 @@ def add(request):
             for backend in get_search_backends():
                 backend.add(image)
 
-            messages.success(request, _("Image '{0}' added.").format(image.title), buttons = [
+            messages.success(request, _("Image '{0}' added.").format(image.title), buttons=[
                 messages.button(reverse('wagtailimages_edit_image', args=(image.id,)), _('Edit'))
             ])
             return redirect('wagtailimages_index')

wagtail/wagtailredirects/views.py

@@ -69,7 +69,7 @@ def edit(request, redirect_id):
         form = form_class(request.POST, request.FILES, instance=theredirect)
         if form.is_valid():
             form.save()
-            messages.success(request, _("Redirect '{0}' updated.").format(theredirect.title), buttons = [
+            messages.success(request, _("Redirect '{0}' updated.").format(theredirect.title), buttons=[
                 messages.button(reverse('wagtailredirects_edit_redirect', args=(theredirect.id,)), _('Edit'))
             ])
             return redirect('wagtailredirects_index')
@@ -112,7 +112,7 @@ def add(request):
             theredirect.site = request.site
             theredirect.save()
 
-            messages.success(request, _("Redirect '{0}' added.").format(theredirect.title), buttons = [
+            messages.success(request, _("Redirect '{0}' added.").format(theredirect.title), buttons=[
                 messages.button(reverse('wagtailredirects_edit_redirect', args=(theredirect.id,)), _('Edit'))
             ])
             return redirect('wagtailredirects_index')

wagtail/wagtailsearch/views/editorspicks.py

@@ -81,7 +81,7 @@ def add(request):
             # Save editors picks
             editors_pick_formset = forms.EditorsPickFormSet(request.POST, instance=query)
             if save_editorspicks(query, query, editors_pick_formset):
-                messages.success(request, _("Editor's picks for '{0}' created.").format(query), buttons = [
+                messages.success(request, _("Editor's picks for '{0}' created.").format(query), buttons=[
                     messages.button(reverse('wagtailsearch_editorspicks_edit', args=(query.id,)), _('Edit'))
                 ])
                 return redirect('wagtailsearch_editorspicks_index')
@@ -117,7 +117,7 @@ def edit(request, query_id):
 
             # Save editors picks
             if save_editorspicks(query, new_query, editors_pick_formset):
-                messages.success(request, _("Editor's picks for '{0}' updated.").format(new_query), buttons = [
+                messages.success(request, _("Editor's picks for '{0}' updated.").format(new_query), buttons=[
                     messages.button(reverse('wagtailsearch_editorspicks_edit', args=(query.id,)), _('Edit'))
                 ])
                 return redirect('wagtailsearch_editorspicks_index')

wagtail/wagtailsnippets/views/snippets.py

@@ -15,6 +15,7 @@ from wagtail.wagtailsnippets.models import get_snippet_content_types
 from wagtail.wagtailsnippets.permissions import user_can_edit_snippet_type
 from wagtail.wagtailadmin import messages
 
+
 # == Helper functions ==
 
 
@@ -129,7 +130,7 @@ def create(request, content_type_app_name, content_type_model_name):
                     snippet_type=capfirst(get_snippet_type_name(content_type)[0]),
                     instance=instance
                 ),
-                buttons = [
+                buttons=[
                     messages.button(reverse('wagtailsnippets_edit', args=(content_type_app_name,content_type_model_name,instance.id,)), _('Edit'))
                 ]
             )
@@ -173,7 +174,7 @@ def edit(request, content_type_app_name, content_type_model_name, id):
                     snippet_type=capfirst(snippet_type_name),
                     instance=instance
                 ),
-                buttons = [
+                buttons=[
                     messages.button(reverse('wagtailsnippets_edit', args=(content_type_app_name,content_type_model_name,instance.id,)), _('Edit'))
                 ]
             )

wagtail/wagtailusers/views/users.py

@@ -83,7 +83,7 @@ def create(request):
         form = UserCreationForm(request.POST)
         if form.is_valid():
             user = form.save()
-            messages.success(request, _("User '{0}' created.").format(user), buttons = [
+            messages.success(request, _("User '{0}' created.").format(user), buttons=[
                 messages.button(reverse('wagtailusers_users_edit', args=(user.id,)), _('Edit'))
             ])
             return redirect('wagtailusers_users_index')
@@ -104,7 +104,7 @@ def edit(request, user_id):
         form = UserEditForm(request.POST, instance=user)
         if form.is_valid():
             user = form.save()
-            messages.success(request, _("User '{0}' updated.").format(user), buttons = [
+            messages.success(request, _("User '{0}' updated.").format(user), buttons=[
                 messages.button(reverse('wagtailusers_users_edit', args=(user.id,)), _('Edit'))
             ])
             return redirect('wagtailusers_users_index')