From 29b3ec4d1cf2f99b33b034cfb8ae73bb70da5eba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Mon, 1 Jan 2018 12:42:21 +0100
Subject: [PATCH 3/3] misc: update context usage for django 1.11 (#20936)

---
 wcs/compat.py       | 6 +++---
 wcs/forms/common.py | 9 +++------
 wcs/qommon/form.py  | 3 +--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/wcs/compat.py b/wcs/compat.py
index 30500d2f..2978481d 100644
--- a/wcs/compat.py
+++ b/wcs/compat.py
@@ -26,7 +26,7 @@ from quixote.http_request import Upload
 
 from django.http import HttpResponse
 from django.conf import settings
-from django.template import loader, RequestContext, TemplateDoesNotExist
+from django.template import loader, TemplateDoesNotExist
 from django.template.response import TemplateResponse
 from django.views.generic.base import TemplateView
 
@@ -158,8 +158,8 @@ class CompatWcsPublisher(WcsPublisher):
             return self.render_response(output)
 
         template_name = 'wcs/base.html'
-        vars = template.get_decorate_vars(output, response)
-        context = RequestContext(request.django_request, vars)
+        context = template.get_decorate_vars(output, response)
+        context['request'] = request.django_request
         django_response = TemplateResponse(request.django_request,
                 template_name,
                 context,
diff --git a/wcs/forms/common.py b/wcs/forms/common.py
index 7bec4855..046a8316 100644
--- a/wcs/forms/common.py
+++ b/wcs/forms/common.py
@@ -25,8 +25,6 @@ from wcs.api_utils import get_user_from_api_query_string, is_url_signed
 from wcs.fields import WidgetField, FileField
 from wcs.workflows import EditableWorkflowStatusItem
 
-from django.template import RequestContext
-
 from qommon import _
 from qommon import misc
 from qommon import template
@@ -226,12 +224,12 @@ class FormStatusPage(Directory):
                 return "Your browser should redirect you"
 
         self.html_top(self.formdef.name)
-        context = RequestContext(get_request().django_request, {
+        context = {
             'view': self,
             'mine': mine,
             'formdata': self.filled,
             'workflow_form': form,
-        })
+        }
 
         return template.render(self.status_templates, context)
 
@@ -245,8 +243,7 @@ class FormStatusPage(Directory):
         if not self.formdef.is_user_allowed_read_status_and_history(get_request().user, self.filled):
             return
 
-        context = RequestContext(get_request().django_request, {'formdata': self.filled})
-        return template.render(self.history_templates, context)
+        return template.render(self.history_templates, {'formdata': self.filled})
 
     def check_receiver(self):
         session = get_session()
diff --git a/wcs/qommon/form.py b/wcs/qommon/form.py
index 5885bf60..b84a405c 100644
--- a/wcs/qommon/form.py
+++ b/wcs/qommon/form.py
@@ -62,7 +62,6 @@ from quixote.form import *
 from quixote.html import htmltext, htmltag, htmlescape, TemplateIO
 from quixote.util import randbytes
 
-from django.template import RequestContext
 from django.utils.safestring import mark_safe
 
 from .template import render as render_template, Template, TemplateError
@@ -124,7 +123,7 @@ def render(self):
     self.rendered_error = lambda: safe(self.render_error(self.get_error()))
     self.rendered_hint = lambda: safe(self.render_hint(self.get_hint()))
     self.rendered_message = lambda: safe(self.render_message(self.get_message()))
-    context = RequestContext(get_request().django_request, {'widget': self})
+    context = {'widget': self}
     template_names = []
     widget_template_name = getattr(self, 'template_name', None)
     for extra_css_class in (getattr(self, 'extra_css_class', '') or '').split():
-- 
2.15.1