Ticket #14878: generic.diff

django/views/generic/list.py

@@ -1 +1 @@
 from django.core.paginator import Paginator, InvalidPage
 from django.core.exceptions import ImproperlyConfigured
 from django.http import Http404
-from django.utils.encoding import smart_str
 from django.views.generic.base import TemplateResponseMixin, View
 
 class MultipleObjectMixin(object):
@@ -74 +73 @@
         Get the name of the item to be used in the context.
         """
         if self.context_object_name:
-            return self.context_object_name
-        elif hasattr(object_list, 'model'):
-            return smart_str(object_list.model._meta.verbose_name_plural)
+            return self.context_object_name+'_list'
         else:
-            return None
+            return 'object_list'
 
     def get_context_data(self, **kwargs):
         """
@@ -92 +89 @@
                 'paginator': paginator,
                 'page_obj': page,
                 'is_paginated': is_paginated,
-                'object_list': queryset
             }
         else:
             context = {
                 'paginator': None,
                 'page_obj': None,
                 'is_paginated': False,
-                'object_list': queryset
             }
         context.update(kwargs)
         context_object_name = self.get_context_object_name(queryset)