The context_instance parameter to render_to_response() and render_to_string() is now deprecated. Fixed this, and generally changed the idiom render_to_response('template.html', {}, RequestContext(request)) to the newer and simpler render(request, 'template.html', {}). About 200 instances.

 - Legacy-Id: 12637

Author: levkowetz

ietf/api/__init__.py

@@ -47,29 +47,29 @@ def to_html(self, data, options=None):
         available to a browser. This is on the TODO list but not currently
         implemented.
         """
-        from django.template.loader import render_to_string as render
+        from django.template.loader import render_to_string
 
         options = options or {}
 
         serialized = self.to_simple_html(data, options)
-        return render("api/base.html", {"data": serialized})
+        return render_to_string("api/base.html", {"data": serialized})
 
     def to_simple_html(self, data, options):
         """
         """
-        from django.template.loader import render_to_string as render
+        from django.template.loader import render_to_string
         #
         if isinstance(data, (list, tuple)):
-            return render("api/listitem.html", {"data": [self.to_simple_html(item, options) for item in data]})
+            return render_to_string("api/listitem.html", {"data": [self.to_simple_html(item, options) for item in data]})
         if isinstance(data, dict):
-            return render("api/dictitem.html", {"data": dict((key, self.to_simple_html(val, options)) for (key, val) in data.items())})
+            return render_to_string("api/dictitem.html", {"data": dict((key, self.to_simple_html(val, options)) for (key, val) in data.items())})
         elif isinstance(data, Bundle):
-            return render("api/dictitem.html", {"data":dict((key, self.to_simple_html(val, options)) for (key, val) in data.data.items())})
+            return render_to_string("api/dictitem.html", {"data":dict((key, self.to_simple_html(val, options)) for (key, val) in data.data.items())})
         elif hasattr(data, 'dehydrated_type'):
             if getattr(data, 'dehydrated_type', None) == 'related' and data.is_m2m == False:
-                return render("api/relitem.html", {"fk": data.fk_resource, "val": self.to_simple_html(data.value, options)})
+                return render_to_string("api/relitem.html", {"fk": data.fk_resource, "val": self.to_simple_html(data.value, options)})
             elif getattr(data, 'dehydrated_type', None) == 'related' and data.is_m2m == True:
-                render("api/listitem.html", {"data": [self.to_simple_html(bundle, options) for bundle in data.m2m_bundles]})
+                render_to_string("api/listitem.html", {"data": [self.to_simple_html(bundle, options) for bundle in data.m2m_bundles]})
             else:
                 return self.to_simple_html(data.value, options)
         elif isinstance(data, datetime.datetime):
@@ -85,7 +85,7 @@ def to_simple_html(self, data, options):
         elif data is None:
             return None
         elif isinstance(data, basestring) and data.startswith("/api/v1/"):  # XXX Will not work for Python 3
-            return render("api/relitem.html", {"fk": data, "val": data.split('/')[-2]})
+            return render_to_string("api/relitem.html", {"fk": data, "val": data.split('/')[-2]})
         else:
             return force_text(data)
 

ietf/cookies/views.py

@@ -1,7 +1,6 @@
 # Copyright The IETF Trust 2010, All Rights Reserved
 
-from django.shortcuts import render_to_response as render
-from django.template import RequestContext
+from django.shortcuts import render
 from django.conf import settings
 
 import debug                            # pyflakes:ignore
@@ -32,7 +31,7 @@ def preferences(request, **kwargs):
             preferences[key] = settings.USER_PREFERENCE_DEFAULTS[key]
             del_cookies += [key]
     request.COOKIES.update(preferences)
-    response = render("cookies/settings.html", preferences, context_instance=RequestContext(request))
+    response = render(request, "cookies/settings.html", preferences )
     for key in new_cookies:
         response.set_cookie(key, new_cookies[key], settings.PREFERENCES_COOKIE_AGE)
     for key in del_cookies:

ietf/doc/views_ballot.py

@@ -4,10 +4,9 @@
 import datetime, json
 
 from django.http import HttpResponseForbidden, HttpResponseRedirect, Http404
-from django.shortcuts import render, render_to_response, get_object_or_404, redirect
+from django.shortcuts import render, get_object_or_404, redirect
 from django.core.urlresolvers import reverse as urlreverse
 from django.template.loader import render_to_string
-from django.template import RequestContext
 from django import forms
 from django.conf import settings
 
@@ -222,7 +221,7 @@ def edit_position(request, name, ballot_id):
 
     ballot_deferred = doc.active_defer_event()
 
-    return render_to_response('doc/ballot/edit_position.html',
+    return render(request, 'doc/ballot/edit_position.html',
                               dict(doc=doc,
                                    form=form,
                                    ad=ad,
@@ -232,8 +231,7 @@ def edit_position(request, name, ballot_id):
                                    ballot = ballot,
                                    show_discuss_text=old_pos and old_pos.pos.blocking,
                                    blocking_positions=json.dumps(blocking_positions),
-                                   ),
-                              context_instance=RequestContext(request))
+                                   ))
 
 
 @role_required('Area Director','Secretariat')
@@ -311,18 +309,17 @@ def send_ballot_comment(request, name, ballot_id):
 
         cc_select_form = CcSelectForm(mailtrigger_slug='ballot_saved',mailtrigger_context={'doc':doc})
 
-    return render_to_response('doc/ballot/send_ballot_comment.html',
-                              dict(doc=doc,
-                                   subject=subject,
-                                   body=body,
-                                   frm=frm,
-                                   to=addrs.as_strings().to,
-                                   ad=ad,
-                                   can_send=d or c,
-                                   back_url=back_url,
-                                   cc_select_form = cc_select_form,
-                                  ),
-                              context_instance=RequestContext(request))
+        return render(request, 'doc/ballot/send_ballot_comment.html',
+                      dict(doc=doc,
+                          subject=subject,
+                          body=body,
+                          frm=frm,
+                          to=addrs.as_strings().to,
+                          ad=ad,
+                          can_send=d or c,
+                          back_url=back_url,
+                          cc_select_form = cc_select_form,
+                      ))
 
 @role_required('Secretariat')
 def clear_ballot(request, name):
@@ -337,10 +334,9 @@ def clear_ballot(request, name):
             do_undefer_ballot(request,doc)
         return redirect("doc_view", name=doc.name)
 
-    return render_to_response('doc/ballot/clear_ballot.html',
+    return render(request, 'doc/ballot/clear_ballot.html',
                               dict(doc=doc,
-                                   back_url=doc.get_absolute_url()),
-                              context_instance=RequestContext(request))
+                                   back_url=doc.get_absolute_url()))
 
 @role_required('Area Director','Secretariat')
 def defer_ballot(request, name):
@@ -388,11 +384,10 @@ def defer_ballot(request, name):
 
         return HttpResponseRedirect(doc.get_absolute_url())
 
-    return render_to_response('doc/ballot/defer_ballot.html',
+    return render(request, 'doc/ballot/defer_ballot.html',
                               dict(doc=doc,
                                    telechat_date=telechat_date,
-                                   back_url=doc.get_absolute_url()),
-                              context_instance=RequestContext(request))
+                                   back_url=doc.get_absolute_url()))
 
 @role_required('Area Director','Secretariat')
 def undefer_ballot(request, name):
@@ -413,11 +408,10 @@ def undefer_ballot(request, name):
         do_undefer_ballot(request,doc)
         return HttpResponseRedirect(doc.get_absolute_url())
 
-    return render_to_response('doc/ballot/undefer_ballot.html',
+    return render(request, 'doc/ballot/undefer_ballot.html',
                               dict(doc=doc,
                                    telechat_date=telechat_date,
-                                   back_url=doc.get_absolute_url()),
-                              context_instance=RequestContext(request))
+                                   back_url=doc.get_absolute_url()))
 
 class LastCallTextForm(forms.Form):
     last_call_text = forms.CharField(widget=forms.Textarea, required=True)
@@ -477,9 +471,8 @@ def lastcalltext(request, name):
 
                     request_last_call(request, doc)
 
-                    return render_to_response('doc/draft/last_call_requested.html',
-                                              dict(doc=doc),
-                                              context_instance=RequestContext(request))
+                    return render(request, 'doc/draft/last_call_requested.html',
+                                              dict(doc=doc))
 
         if "regenerate_last_call_text" in request.POST:
             e = generate_last_call_announcement(request, doc)
@@ -497,15 +490,14 @@ def lastcalltext(request, name):
     if not doc.intended_std_level:
         need_intended_status = doc.file_tag()
 
-    return render_to_response('doc/ballot/lastcalltext.html',
+    return render(request, 'doc/ballot/lastcalltext.html',
                               dict(doc=doc,
                                    back_url=doc.get_absolute_url(),
                                    last_call_form=form,
                                    can_request_last_call=can_request_last_call,
                                    can_make_last_call=can_make_last_call,
                                    need_intended_status=need_intended_status,
-                                   ),
-                              context_instance=RequestContext(request))
+                                   ))
 
 class BallotWriteupForm(forms.Form):
     ballot_writeup = forms.CharField(widget=forms.Textarea, required=True)
@@ -582,24 +574,22 @@ def ballot_writeupnotes(request, name):
                 e.desc = "Ballot has been issued"
                 e.save()
 
-                return render_to_response('doc/ballot/ballot_issued.html',
+                return render(request, 'doc/ballot/ballot_issued.html',
                                           dict(doc=doc,
-                                               back_url=doc.get_absolute_url()),
-                                          context_instance=RequestContext(request))
+                                               back_url=doc.get_absolute_url()))
 
 
     need_intended_status = ""
     if not doc.intended_std_level:
         need_intended_status = doc.file_tag()
 
-    return render_to_response('doc/ballot/writeupnotes.html',
+    return render(request, 'doc/ballot/writeupnotes.html',
                               dict(doc=doc,
                                    back_url=doc.get_absolute_url(),
                                    ballot_issued=bool(doc.latest_event(type="sent_ballot_announcement")),
                                    ballot_writeup_form=form,
                                    need_intended_status=need_intended_status,
-                                   ),
-                              context_instance=RequestContext(request))
+                                   ))
 
 class BallotRfcEditorNoteForm(forms.Form):
     rfc_editor_note = forms.CharField(widget=forms.Textarea, label="RFC Editor Note", required=True)
@@ -646,12 +636,11 @@ def ballot_rfceditornote(request, name):
         # make sure form shows a blank RFC Editor Note
         form = BallotRfcEditorNoteForm(initial=dict(rfc_editor_note=" "))
 
-    return render_to_response('doc/ballot/rfceditornote.html',
+    return render(request, 'doc/ballot/rfceditornote.html',
                               dict(doc=doc,
                                    back_url=doc.get_absolute_url(),
                                    ballot_rfceditornote_form=form,
-                                   ),
-                              context_instance=RequestContext(request))
+                                   ))
 
 class ApprovalTextForm(forms.Form):
     approval_text = forms.CharField(widget=forms.Textarea, required=True)
@@ -701,14 +690,13 @@ def ballot_approvaltext(request, name):
     if not doc.intended_std_level:
         need_intended_status = doc.file_tag()
 
-    return render_to_response('doc/ballot/approvaltext.html',
+    return render(request, 'doc/ballot/approvaltext.html',
                               dict(doc=doc,
                                    back_url=doc.get_absolute_url(),
                                    approval_text_form=form,
                                    can_announce=can_announce,
                                    need_intended_status=need_intended_status,
-                                   ),
-                              context_instance=RequestContext(request))
+                                   ))
 
 @role_required('Secretariat')
 def approve_ballot(request, name):
@@ -737,9 +725,7 @@ def approve_ballot(request, name):
         ballot_writeup += "\n\n" + e.text
 
     if error_duplicate_rfc_editor_note:
-        return render_to_response('doc/draft/rfceditor_note_duplicate_error.html',
-                                  dict(doc=doc),
-                                  context_instance=RequestContext(request))
+        return render(request, 'doc/draft/rfceditor_note_duplicate_error.html', {'doc': doc})
 
     if "NOT be published" in approval_text:
         action = "do_not_publish"
@@ -817,11 +803,10 @@ def approve_ballot(request, name):
 
         return HttpResponseRedirect(doc.get_absolute_url())
 
-    return render_to_response('doc/ballot/approve_ballot.html',
+    return render(request, 'doc/ballot/approve_ballot.html',
                               dict(doc=doc,
                                    action=action,
-                                   announcement=announcement),
-                              context_instance=RequestContext(request))
+                                   announcement=announcement))
 
 
 class MakeLastCallForm(forms.Form):
@@ -921,9 +906,8 @@ def make_last_call(request, name):
 
         form = MakeLastCallForm(initial=initial)
 
-    return render_to_response(templ,
+    return render(request, templ,
                               dict(doc=doc,
                                    form=form,
                                    announcement=announcement,
-                                  ),
-                              context_instance=RequestContext(request))
+                                  ))

ietf/doc/views_conflict_review.py

@@ -1,7 +1,7 @@
 import datetime, os
 
 from django import forms
-from django.shortcuts import render_to_response, get_object_or_404, redirect
+from django.shortcuts import render, get_object_or_404, redirect
 from django.http import HttpResponseRedirect, Http404
 from django.core.urlresolvers import reverse
 from django.template import RequestContext
@@ -78,13 +78,12 @@ def change_state(request, name, option=None):
         init = dict(review_state=s.pk if s else None)
         form = ChangeStateForm(initial=init)
 
-    return render_to_response('doc/change_state.html',
+    return render(request, 'doc/change_state.html',
                               dict(form=form,
                                    doc=review,
                                    login=login,
                                    help_url=reverse('state_help', kwargs=dict(type="conflict-review")),
-                                   ),
-                              context_instance=RequestContext(request))
+                                   ))
 
 def send_conflict_review_started_email(request, review):
     addrs = gather_address_lists('conflrev_requested',doc=review).as_strings(compact=False)
@@ -209,13 +208,12 @@ def submit(request, name):
 
         form = UploadForm(initial=init)
 
-    return render_to_response('doc/conflict_review/submit.html',
+    return render(request, 'doc/conflict_review/submit.html',
                               {'form': form,
                                'next_rev': next_rev,
                                'review' : review,
                                'conflictdoc' : review.relateddocument_set.get(relationship__slug='conflrev').target.document,
-                              },
-                              context_instance=RequestContext(request))
+                              })
 
 @role_required("Area Director", "Secretariat")
 def edit_ad(request, name):
@@ -243,7 +241,7 @@ def edit_ad(request, name):
 
     conflictdoc = review.relateddocument_set.get(relationship__slug='conflrev').target.document
     titletext = 'the conflict review of %s-%s' % (conflictdoc.canonical_name(),conflictdoc.rev)
-    return render_to_response('doc/change_ad.html',
+    return render(request, 'doc/change_ad.html',
                               {'form': form,
                                'doc': review,
                                'titletext': titletext
@@ -330,13 +328,12 @@ def approve(request, name):
         init = { "announcement_text" : default_approval_text(review) }
         form = AnnouncementForm(initial=init)
 
-    return render_to_response('doc/conflict_review/approve.html',
+    return render(request, 'doc/conflict_review/approve.html',
                               dict(
                                    review = review,
                                    conflictdoc = review.relateddocument_set.get(relationship__slug='conflrev').target.document,   
                                    form = form,
-                                   ),
-                              context_instance=RequestContext(request))
+                                   ))
 
 class SimpleStartReviewForm(forms.Form):
     notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas.", required=False)
@@ -453,7 +450,7 @@ def start_review_as_secretariat(request, name):
                }
         form = StartReviewForm(initial=init)
 
-    return render_to_response('doc/conflict_review/start.html',
+    return render(request, 'doc/conflict_review/start.html',
                               {'form':   form,
                                'doc_to_review': doc_to_review,
                               },
@@ -487,7 +484,7 @@ def start_review_as_stream_owner(request, name):
                }
         form = SimpleStartReviewForm(initial=init)
 
-    return render_to_response('doc/conflict_review/start.html',
+    return render(request, 'doc/conflict_review/start.html',
                               {'form':   form,
                                'doc_to_review': doc_to_review,
                               },