Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop

djadmin2/actions.py

@@ -20,7 +20,8 @@ class BaseListAction(AdminModel2Mixin, TemplateView):
 
     permission_classes = (permissions.IsStaffPermission,)
 
-    empty_message = 'Items must be selected in order to perform actions on them. No items have been changed.'
+    empty_message = 'Items must be selected in order to perform actions on them. ' + \
+                    'No items have been changed.'
     success_message = 'Successfully deleted %d %s'
 
     queryset = None

djadmin2/core.py

@@ -124,7 +124,7 @@ class Admin2(object):
             url(regex=r'^$',
                 view=self.index_view.as_view(**self.get_index_kwargs()),
                 name='dashboard'
-            ),
+                ),
             url(regex='^auth/user/(?P<pk>\d+)/update/password/$',
                 view=views.PasswordChangeView.as_view(),
                 name='password_change'
@@ -137,16 +137,14 @@ class Admin2(object):
                 view=views.LogoutView.as_view(),
                 name='logout'
                 ),
-            url(
-                regex=r'^(?P<app_label>\w+)/$',
+            url(regex=r'^(?P<app_label>\w+)/$',
                 view=self.app_index_view.as_view(**self.get_app_index_kwargs()),
                 name='app_index'
-            ),
-            url(
-                regex=r'^api/v0/$',
+                ),
+            url(regex=r'^api/v0/$',
                 view=self.api_index_view.as_view(**self.get_api_index_kwargs()),
                 name='api_index'
-            ),
+                ),
         )
 
         for model, model_admin in self.registry.iteritems():

djadmin2/forms.py

@@ -2,9 +2,8 @@ from __future__ import unicode_literals
 from copy import deepcopy
 
 from django.contrib.auth import authenticate
-from django.contrib.auth.forms import (
-        AuthenticationForm, UserCreationForm, UserChangeForm
-    )
+from django.contrib.auth.forms import AuthenticationForm
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm
 import django.forms
 import django.forms.models
 import django.forms.extras.widgets
@@ -225,7 +224,7 @@ def floppify_form(form_class):
 
 
 def modelform_factory(model, form=django.forms.models.ModelForm, fields=None,
-                      exclude=None, formfield_callback=None,  widgets=None):
+                      exclude=None, formfield_callback=None, widgets=None):
     form_class = django.forms.models.modelform_factory(
         model=model,
         form=form,
@@ -246,8 +245,11 @@ class AdminAuthenticationForm(AuthenticationForm):
     Liberally copied from django.contrib.admin.forms.AdminAuthenticationForm
 
     """
-    this_is_the_login_form = django.forms.BooleanField(widget=floppyforms.HiddenInput, initial=1,
-        error_messages={'required': ugettext_lazy("Please log in again, because your session has expired.")})
+    error_messages = {
+        'required': ugettext_lazy("Please log in again, because your session has expired."),
+    }
+    this_is_the_login_form = django.forms.BooleanField(widget=floppyforms.HiddenInput,
+            initial=1, error_messages=error_messages)
 
     def clean(self):
         username = self.cleaned_data.get('username')

djadmin2/utils.py

@@ -22,6 +22,7 @@ def lookup_needs_distinct(opts, lookup_path):
          return True
     return False
 
+
 def model_options(model):
     """
     Wrapper for accessing model._meta. If this access point changes in core

djadmin2/views.py

@@ -20,21 +20,19 @@ from .viewmixins import Admin2Mixin, AdminModel2Mixin, Admin2ModelFormMixin
 
 
 class IndexView(Admin2Mixin, generic.TemplateView):
-    """ 
-Context Variables
-    
-        :apps: A dictionary of apps, each app being a dictionary with keys
-                being models and the value being djadmin2.types.ModelAdmin2
-                objects.
-                
-        :request.user: The user object representing the current user.
+    """Context Variables
+
+    :apps: A dictionary of apps, each app being a dictionary with keys
+           being models and the value being djadmin2.types.ModelAdmin2
+           objects.
+    :request.user: The user object representing the current user.
+
     """
     default_template_name = "index.html"
     registry = None
     apps = None
 
     def get_context_data(self, **kwargs):
-        
         data = super(IndexView, self).get_context_data(**kwargs)
         data.update({
             'apps': self.apps,