Merge branch 'pep8' of https://github.com/phalt/wagtail into phalt-pep8

wagtail/wagtailadmin/forms.py

@@ -8,9 +8,10 @@ class SearchForm(forms.Form):
         placeholder_suffix = kwargs.pop('placeholder_suffix', "")
         super(SearchForm, self).__init__(*args, **kwargs)
         self.fields['q'].widget.attrs = {'placeholder': 'Search ' + placeholder_suffix}
-    
+
     q = forms.CharField(label="Search term", widget=forms.TextInput())
 
+
 class ExternalLinkChooserForm(forms.Form):
     url = forms.URLField(required=True)
 

wagtail/wagtailsearch/__init__.py

@@ -1,4 +1,4 @@
 from indexed import Indexed
 from search import Search
 from searcher import Searcher
-from signal_handlers import register_signal_handlers
+from signal_handlers import register_signal_handlers

wagtail/wagtailsearch/migrations/0001_initial.py

@@ -56,7 +56,6 @@ class Migration(SchemaMigration):
         ))
         db.send_create_signal(u'wagtailsearch', ['SearchTestChild'])
 
-
     def backwards(self, orm):
         # Removing unique constraint on 'QueryDailyHits', fields ['query', 'date']
         db.delete_unique(u'wagtailsearch_querydailyhits', ['query_id', 'date'])
@@ -76,7 +75,6 @@ class Migration(SchemaMigration):
         # Deleting model 'SearchTestChild'
         db.delete_table(u'wagtailsearch_searchtestchild')
 
-
     models = {
         u'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -164,4 +162,4 @@ class Migration(SchemaMigration):
         }
     }
 
-    complete_apps = ['wagtailsearch']
+    complete_apps = ['wagtailsearch']

wagtail/wagtailsearch/views/editorspicks.py

@@ -1,14 +1,14 @@
 from django.shortcuts import render, redirect, get_object_or_404
 from django.contrib.auth.decorators import login_required
 
-from wagtail.wagtailsearch import models, forms
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 
 from wagtail.wagtailsearch import models, forms
 from wagtail.wagtailadmin.forms import SearchForm
 
+
 @login_required
-def index(request):  
+def index(request):
     q = None
     p = request.GET.get("p", 1)
     is_searching = False
@@ -20,7 +20,7 @@ def index(request):
             is_searching = True
 
             queries = models.Query.objects.filter(editors_picks__isnull=False).distinct().filter(query_string__icontains=q)
-    
+
     if not is_searching:
         # Select only queries with editors picks
         queries = models.Query.objects.filter(editors_picks__isnull=False).distinct()

wagtail/wagtailsearch/views/frontend.py

@@ -6,8 +6,6 @@ from django.http import HttpResponse
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 
 from wagtail.wagtailcore import models
-
-from wagtail.wagtailsearch import Search
 from wagtail.wagtailsearch.models import Query
 
 

wagtail/wagtailsnippets/models.py

@@ -4,6 +4,7 @@ SNIPPET_MODELS = []
 
 SNIPPET_CONTENT_TYPES = None
 
+
 def get_snippet_content_types():
     global SNIPPET_CONTENT_TYPES
     if SNIPPET_CONTENT_TYPES is None:
@@ -14,6 +15,7 @@ def get_snippet_content_types():
 
     return SNIPPET_CONTENT_TYPES
 
+
 def register_snippet(model):
     if model not in SNIPPET_MODELS:
         SNIPPET_MODELS.append(model)

wagtail/wagtailusers/views/users.py

@@ -14,11 +14,11 @@ def index(request):
     users = User.objects.order_by('last_name', 'first_name')
 
     if 'ordering' in request.GET:
-        ordering = request.GET['ordering']  
+        ordering = request.GET['ordering']
 
         if ordering in ['name', 'username']:
             if ordering != 'name':
-                users = users.order_by(ordering)   
+                users = users.order_by(ordering)
     else:
         ordering = 'name'