From 9e4035118e857d4880cdc02e162877ae83ba6971 Mon Sep 17 00:00:00 2001 From: Charles Francois Rey Date: Fri, 16 Sep 2016 16:30:25 +0200 Subject: [PATCH] Fix render_to_string() calls with unexpected context_instance parameter (Django 1.10 compatibility) --- authority/admin.py | 3 +-- authority/templatetags/permissions.py | 4 ++-- authority/views.py | 8 +++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/authority/admin.py b/authority/admin.py index 8981e0a..fe061da 100644 --- a/authority/admin.py +++ b/authority/admin.py @@ -122,8 +122,7 @@ def edit_permissions(modeladmin, request, queryset): "admin/%s/permission_change_form.html" % app_label, "admin/permission_change_form.html" ]) - return render_to_response(template_name, context, - context_instance=template.RequestContext(request)) + return render_to_response(template_name, context, request) edit_permissions.short_description = _("Edit permissions for selected %(verbose_name_plural)s") diff --git a/authority/templatetags/permissions.py b/authority/templatetags/permissions.py index b341d59..3a0a00c 100644 --- a/authority/templatetags/permissions.py +++ b/authority/templatetags/permissions.py @@ -190,8 +190,8 @@ class PermissionFormNode(ResolverNode): approved=self.approved, initial=dict(codename=perm, user=request.user.username)), } - return template.loader.render_to_string( - template_name, extra_context, context_instance=template.RequestContext(request)) + return template.loader.render_to_string(template_name, extra_context, + request) @register.tag diff --git a/authority/views.py b/authority/views.py index a94389f..c833d2b 100644 --- a/authority/views.py +++ b/authority/views.py @@ -2,7 +2,6 @@ from django.shortcuts import render_to_response, get_object_or_404 from django.http import HttpResponseRedirect, HttpResponseForbidden from django.apps import apps from django.utils.translation import ugettext as _ -from django.template.context import RequestContext from django.template import loader from django.contrib.auth.decorators import login_required @@ -63,8 +62,7 @@ def add_permission(request, app_label, module_name, pk, approved=False, } if extra_context: context.update(extra_context) - return render_to_response(template_name, context, - context_instance=RequestContext(request)) + return render_to_response(template_name, context, request) @login_required @@ -110,5 +108,5 @@ def permission_denied(request, template_name=None, extra_context=None): } if extra_context: context.update(extra_context) - return HttpResponseForbidden(loader.render_to_string(template_name, context, - context_instance=RequestContext(request))) + return HttpResponseForbidden(loader.render_to_string(template_name, + context, request))