chg: dev: Simplified context handling

Thanks to @claudep for the patch

Closes django-haystack#1330

Author: acdha

docs/views_and_forms.rst

@@ -254,7 +254,7 @@ The functional view provides an example of how Haystack can be used in more
 traditional settings or as an example of how to write a more complex custom
 view. It is also thread-safe.
 
-``SearchView(template=None, load_all=True, form_class=None, searchqueryset=None, context_class=RequestContext, results_per_page=None)``
+``SearchView(template=None, load_all=True, form_class=None, searchqueryset=None, results_per_page=None)``
 ---------------------------------------------------------------------------------------------------------------------------------------
 
 The ``SearchView`` is designed to be easy/flexible enough to override common
@@ -372,7 +372,7 @@ creates the context and renders the response for all the aforementioned
 processing.
 
 
-``basic_search(request, template='search/search.html', load_all=True, form_class=ModelSearchForm, searchqueryset=None, context_class=RequestContext, extra_context=None, results_per_page=None)``
+``basic_search(request, template='search/search.html', load_all=True, form_class=ModelSearchForm, searchqueryset=None, extra_context=None, results_per_page=None)``
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 The ``basic_search`` tries to provide most of the same functionality as the

haystack/admin.py

@@ -2,12 +2,11 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-from django import template
-from django.contrib.admin.options import csrf_protect_m, ModelAdmin
-from django.contrib.admin.views.main import ChangeList, SEARCH_VAR
+from django.contrib.admin.options import ModelAdmin, csrf_protect_m
+from django.contrib.admin.views.main import SEARCH_VAR, ChangeList
 from django.core.exceptions import PermissionDenied
 from django.core.paginator import InvalidPage, Paginator
-from django.shortcuts import render_to_response
+from django.shortcuts import render
 from django.utils.encoding import force_text
 from django.utils.translation import ungettext
 
@@ -146,13 +145,13 @@ def changelist_view(self, request, extra_context=None):
             'actions_selection_counter': getattr(self, 'actions_selection_counter', 0),
         }
         context.update(extra_context or {})
-        context_instance = template.RequestContext(request, current_app=self.admin_site.name)
+        request.current_app = self.admin_site.name
         app_name, model_name = get_model_ct_tuple(self.model)
-        return render_to_response(self.change_list_template or [
+        return render(request, self.change_list_template or [
             'admin/%s/%s/change_list.html' % (app_name, model_name),
             'admin/%s/change_list.html' % app_name,
             'admin/change_list.html'
-        ], context, context_instance=context_instance)
+        ], context)
 
 
 class SearchModelAdmin(SearchModelAdminMixin, ModelAdmin):

haystack/fields.py

@@ -136,7 +136,7 @@ def prepare_template(self, obj):
             template_names = ['search/indexes/%s/%s_%s.txt' % (app_label, model_name, self.instance_name)]
 
         t = loader.select_template(template_names)
-        return t.render(Context({'object': obj}))
+        return t.render(Context({'object': obj}).flatten())
 
     def convert(self, value):
         """

haystack/views.py

@@ -5,8 +5,7 @@
 from django.conf import settings
 from django.core.paginator import InvalidPage, Paginator
 from django.http import Http404
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render
 
 from haystack.forms import FacetedSearchForm, ModelSearchForm
 from haystack.query import EmptySearchQuerySet
@@ -23,10 +22,9 @@ class SearchView(object):
     form = None
     results_per_page = RESULTS_PER_PAGE
 
-    def __init__(self, template=None, load_all=True, form_class=None, searchqueryset=None, context_class=RequestContext, results_per_page=None):
+    def __init__(self, template=None, load_all=True, form_class=None, searchqueryset=None, results_per_page=None):
         self.load_all = load_all
         self.form_class = form_class
-        self.context_class = context_class
         self.searchqueryset = searchqueryset
 
         if form_class is None:
@@ -144,7 +142,7 @@ def create_response(self):
             context['suggestion'] = self.form.get_suggestion()
 
         context.update(self.extra_context())
-        return render_to_response(self.template, context, context_instance=self.context_class(self.request))
+        return render(self.request, self.template, context)
 
 
 def search_view_factory(view_class=SearchView, *args, **kwargs):
@@ -178,7 +176,7 @@ def extra_context(self):
         return extra
 
 
-def basic_search(request, template='search/search.html', load_all=True, form_class=ModelSearchForm, searchqueryset=None, context_class=RequestContext, extra_context=None, results_per_page=None):
+def basic_search(request, template='search/search.html', load_all=True, form_class=ModelSearchForm, searchqueryset=None, extra_context=None, results_per_page=None):
     """
     A more traditional view that also demonstrate an alternative
     way to use Haystack.
@@ -232,4 +230,4 @@ def basic_search(request, template='search/search.html', load_all=True, form_cla
     if extra_context:
         context.update(extra_context)
 
-    return render_to_response(template, context, context_instance=context_class(request))
+    return render(request, template, context)