Add 'object' to context in SingleObjectMixin

To match the documentation of SingleObjectMixin, if it is used separately from (Base)DetailView.

django/views/generic/detail.py

@@ -93,6 +93,8 @@ def get_context_data(self, **kwargs):
         Insert the single object into the context dict.
         """
         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
@@ -106,7 +108,7 @@ class BaseDetailView(SingleObjectMixin, View):
     """
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
-        context = self.get_context_data(object=self.object)
+        context = self.get_context_data()
         return self.render_to_response(context)
 
 

tests/generic_views/base.py

@@ -403,8 +403,9 @@ def test_get_context_data_super(self):
         test_view = views.CustomContextView()
         context = test_view.get_context_data(kwarg_test='kwarg_value')
 
-        # the test_name key is inserted by the test classes parent
+        # the test_name and object keys are inserted by the test class's parent
         self.assertTrue('test_name' in context)
+        self.assertTrue('object' in context)
         self.assertEqual(context['kwarg_test'], 'kwarg_value')
         self.assertEqual(context['custom_key'], 'custom_value')