Use the new ContextMixin from Django 1.5

extra_views/advanced.py

@@ -3,6 +3,7 @@
 from extra_views.formsets import BaseInlineFormSetMixin
 from django.http import HttpResponseRedirect
 from django.forms.formsets import all_valid
+from .compat import ContextMixin
 
 
 class InlineFormSet(BaseInlineFormSetMixin):
@@ -93,15 +94,15 @@ class UpdateWithInlinesView(SingleObjectTemplateResponseMixin, BaseUpdateWithInl
     template_name_suffix = '_form'
 
 
-class NamedFormsetsMixin(object):
+class NamedFormsetsMixin(ContextMixin):
     inlines_names = []
 
     def get_context_data(self, **kwargs):
-        ctx = super(NamedFormsetsMixin, self).get_context_data(**kwargs)
-        if not self.inlines_names:
-            return ctx
-        # We have formset or inlines in context, but never both
-        ctx.update(zip(self.inlines_names, kwargs.get('inlines',[])))
-        if 'formset' in kwargs:
-            ctx[self.inlines_names[0]] = kwargs['formset']
-        return ctx
+        context = {}
+        if self.inlines_names:
+            # We have formset or inlines in context, but never both
+            context.update(zip(self.inlines_names, kwargs.get('inlines', [])))
+            if 'formset' in kwargs:
+                context[self.inlines_names[0]] = kwargs['formset']
+        context.update(kwargs)
+        return super(NamedFormsetsMixin, self).get_context_data(**context)

extra_views/compat.py

@@ -0,0 +1,15 @@
+# ContextMixin was introduced in Django 1.5, we provide a copy for earlier
+# versions.
+try:
+    from django.views.generic.base import ContextMixin
+except ImportError:
+    class ContextMixin(object):
+        """
+        A default context mixin that passes the keyword arguments received by
+        get_context_data as the template context.
+        """
+
+        def get_context_data(self, **kwargs):
+            if 'view' not in kwargs:
+                kwargs['view'] = self
+            return kwargs

extra_views/contrib/mixins.py

@@ -3,6 +3,7 @@
 from django.db.models import Q
 import datetime
 import operator
+from ..compat import ContextMixin
 
 VALID_STRING_LOOKUPS = ('iexact', 'contains', 'icontains', 'startswith', 'istartswith', 'endswith', 'iendswith',
     'search', 'regex', 'iregex')
@@ -123,7 +124,7 @@ def get_sort(self):
         return sort
 
 
-class SortableListMixin(object):
+class SortableListMixin(ContextMixin):
     """
     You can provide either sort_fields as a plain list like ['id', 'some', 'foo__bar', ...]
     or, if you want to hide original field names you can provide list of tuples with aliace that will be used:
@@ -158,7 +159,8 @@ def get_queryset(self):
         return self._sort_queryset(qs)
 
     def get_context_data(self, **kwargs):
-        ctx = super(SortableListMixin, self).get_context_data(**kwargs)
+        context = {}
         if hasattr(self, 'sort_helper'):
-            ctx['sort_helper'] = self.sort_helper
-        return ctx
+            context['sort_helper'] = self.sort_helper
+        context.update(kwargs)
+        return super(SortableListMixin, self).get_context_data(**context)

extra_views/formsets.py

@@ -5,6 +5,7 @@
 from django.views.generic.detail import SingleObjectMixin, SingleObjectTemplateResponseMixin
 from django.views.generic.list import MultipleObjectMixin, MultipleObjectTemplateResponseMixin
 from django.forms.models import BaseInlineFormSet
+from .compat import ContextMixin
 
 
 class BaseFormSetMixin(object):
@@ -59,10 +60,7 @@ def get_factory_kwargs(self):
         return kwargs
 
 
-class FormSetMixin(BaseFormSetMixin):
-    def get_context_data(self, **kwargs):
-        return kwargs
-
+class FormSetMixin(BaseFormSetMixin, ContextMixin):
     def get_success_url(self):
         if self.success_url:
             url = self.success_url
@@ -84,14 +82,19 @@ class ModelFormSetMixin(FormSetMixin, MultipleObjectMixin):
     formfield_callback = None
 
     def get_context_data(self, **kwargs):
-        context = kwargs
+        context = {}
 
         if self.object_list:
             context['object_list'] = self.object_list
             context_object_name = self.get_context_object_name(self.get_queryset())
             if context_object_name:
                 context[context_object_name] = self.object_list
-        return context
+        context.update(kwargs)
+
+        # MultipleObjectMixin get_context_data() doesn't work when object_list
+        # is not provided in kwargs, so we skip MultipleObjectMixin and call
+        # ContextMixin directly.
+        return ContextMixin.get_context_data(self, **context)
 
     def construct_formset(self):
         return self.get_formset()(queryset=self.get_queryset(), **self.get_formset_kwargs())
@@ -129,14 +132,15 @@ class BaseInlineFormSetMixin(BaseFormSetMixin):
     save_as_new = False
 
     def get_context_data(self, **kwargs):
-        context = kwargs
+        context = {}
 
         if self.object:
             context['object'] = self.object
             context_object_name = self.get_context_object_name(self.object)
             if context_object_name:
                 context[context_object_name] = self.object
-        return context
+        context.update(kwargs)
+        return super(BaseInlineFormSetMixin, self).get_context_data(**context)
 
     def construct_formset(self):
         return self.get_formset()(instance=self.object, **self.get_formset_kwargs())

extra_views/multi.py

@@ -5,6 +5,7 @@
 from django.forms.models import modelformset_factory
 from django.forms import models as model_forms
 from django.forms import ValidationError
+from .compat import ContextMixin
 
 
 class FormProvider(object):
@@ -40,7 +41,7 @@ def get_form(self, caller, prefix):
         return form
 
 
-class MultiFormMixin(object):
+class MultiFormMixin(ContextMixin):
     """
     Handle multiple forms in a single view
     """
@@ -101,9 +102,6 @@ def get_form_kwargs(self, prefix):
             })
         return kwargs
 
-    def get_context_data(self, **kwargs):
-        return kwargs
-
     def get_success_url(self):
         if self.success_url:
             url = self.success_url