From af26da610608dc1aedbec93820e7f7b1dd9e72c2 Mon Sep 17 00:00:00 2001 From: Hodossy Szabolcs Date: Mon, 25 Sep 2017 14:15:00 +0200 Subject: [PATCH 1/3] Django 1.11 compatibility --- categories/views.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/categories/views.py b/categories/views.py index e844b48..86c0e0f 100644 --- a/categories/views.py +++ b/categories/views.py @@ -1,6 +1,5 @@ from django.shortcuts import get_object_or_404 from django.core.exceptions import ObjectDoesNotExist -from django.template import RequestContext from django.http import HttpResponse, Http404 from django.template.loader import select_template from django.utils.translation import ugettext_lazy as _ @@ -37,8 +36,7 @@ def category_detail(request, path, template_name='categories/category_detail.htm path_items.pop() templates.append(template_name) - context = RequestContext(request) - context.update({'category': category}) + context = {'category': category} if extra_context: context.update(extra_context) return HttpResponse(select_template(templates).render(context)) From 829d1cc522151a9ccc9cbd04e9622ee397be688d Mon Sep 17 00:00:00 2001 From: Hodossy Szabolcs Date: Tue, 26 Sep 2017 07:47:28 +0200 Subject: [PATCH 2/3] Removing every occurrence of Requestcontext and Context --- categories/editor/tree_editor.py | 7 +------ categories/tests/test_templatetags.py | 3 +-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/categories/editor/tree_editor.py b/categories/editor/tree_editor.py index a051ad3..2169e5d 100644 --- a/categories/editor/tree_editor.py +++ b/categories/editor/tree_editor.py @@ -4,7 +4,6 @@ from django.contrib.admin.views.main import ChangeList from django.http import HttpResponseRedirect from django.utils.translation import ugettext_lazy as _ from django.contrib.admin.options import IncorrectLookupParameters -from django import template from django.shortcuts import render_to_response import django @@ -253,15 +252,11 @@ class TreeEditor(admin.ModelAdmin): 'selection_note_all': selection_note_all % {'total_count': cl.result_count}, }) context.update(extra_context or {}) - context_instance = template.RequestContext( - request, - context - ) return render_to_response(self.change_list_template or [ 'admin/%s/%s/change_list.html' % (app_label, opts.object_name.lower()), 'admin/%s/change_list.html' % app_label, 'admin/change_list.html' - ], context=context_instance.flatten()) + ], context=context) def changelist_view(self, request, extra_context=None, *args, **kwargs): """ diff --git a/categories/tests/test_templatetags.py b/categories/tests/test_templatetags.py index f099715..ba6d35e 100644 --- a/categories/tests/test_templatetags.py +++ b/categories/tests/test_templatetags.py @@ -14,8 +14,7 @@ class CategoryTagsTest(TestCase): Return the rendered string or raise an exception. """ tpl = template.Template(template_string) - ctxt = template.Context(context) - return tpl.render(ctxt) + return tpl.render(context) def testTooFewArguments(self): """ From 254a05d2d41ffbbbe301c770e369559e14fbef2b Mon Sep 17 00:00:00 2001 From: Hodossy Szabolcs Date: Tue, 26 Sep 2017 08:18:36 +0200 Subject: [PATCH 3/3] This should have stayed --- categories/tests/test_templatetags.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/categories/tests/test_templatetags.py b/categories/tests/test_templatetags.py index ba6d35e..f099715 100644 --- a/categories/tests/test_templatetags.py +++ b/categories/tests/test_templatetags.py @@ -14,7 +14,8 @@ class CategoryTagsTest(TestCase): Return the rendered string or raise an exception. """ tpl = template.Template(template_string) - return tpl.render(context) + ctxt = template.Context(context) + return tpl.render(ctxt) def testTooFewArguments(self): """