Replace render_to_response with render

This is rquired as part of the move to a newer Django, and works fine on
older versions too

diff --git a/pgcommitfest/commitfest/reports.py b/pgcommitfest/commitfest/reports.py
index 795e8cac7dc864293480a91453c7250fde3cda55..f0d352e3f5807bbfdf2e92f0645992541de942e8 100644 (file)
--- a/pgcommitfest/commitfest/reports.py
+++ b/pgcommitfest/commitfest/reports.py
@@ -1,4 +1,4 @@
-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render, get_object_or_404
 from django.http import Http404
 from django.template import RequestContext
 from django.contrib.auth.decorators import login_required
@@ -38,9 +38,9 @@ ORDER BY last_name, first_name
        'cid': cf.id,
 })
 
-       return render_to_response('report_authors.html', {
+       return render(request, 'report_authors.html', {
                'cf': cf,
                'report': cursor.fetchall(),
                'title': 'Author stats',
                'breadcrumbs': [{'title': cf.title, 'href': '/%s/' % cf.pk},],
-       }, context_instance=RequestContext(request))
+       })

diff --git a/pgcommitfest/commitfest/views.py b/pgcommitfest/commitfest/views.py
index d8093404e7b536a117d6c6513206c774cafd1215..8eadafa52889e42554bba6fda2824466d42aab9b 100644 (file)
--- a/pgcommitfest/commitfest/views.py
+++ b/pgcommitfest/commitfest/views.py
@@ -1,5 +1,7 @@
-from django.shortcuts import render_to_response, get_object_or_404
-from django.http import HttpResponseRedirect, Http404, HttpResponseForbidden
+from django.shortcuts import render, get_object_or_404
+from django.http import HttpResponse, HttpResponseRedirect
+from django.http import Http404, HttpResponseForbidden
+from django.views.decorators.csrf import csrf_exempt
 from django.template import RequestContext
 from django.db import transaction, connection
 from django.db.models import Q
@@ -27,14 +29,14 @@ def home(request):
        opencf = next((c for c in commitfests if c.status == CommitFest.STATUS_OPEN), None)
        inprogresscf = next((c for c in commitfests if c.status == CommitFest.STATUS_INPROGRESS), None)
 
-       return render_to_response('home.html', {
+       return render(request, 'home.html', {
                'commitfests': commitfests,
                'opencf': opencf,
                'inprogresscf': inprogresscf,
                'title': 'Commitfests',
                'header_activity': 'Activity log',
                'header_activity_link': '/activity/',
-               }, context_instance=RequestContext(request))
+               })
 
 
 def activity(request, cfid=None, rss=None):
@@ -69,14 +71,14 @@ def activity(request, cfid=None, rss=None):
                return ActivityFeed(activity, cf)(request)
        else:
                # Return regular webpage
-               return render_to_response('activity.html', {
+               return render(request, 'activity.html', {
                        'commitfest': cf,
                        'activity': activity,
                        'title': cf and 'Commitfest activity' or 'Global Commitfest activity',
                        'rss_alternate': cf and '/{0}/activity.rss/'.format(cf.id) or '/activity.rss/',
                        'rss_alternate_title': 'PostgreSQL Commitfest Activity Log',
                        'breadcrumbs': cf and [{'title': cf.title, 'href': '/%s/' % cf.pk},] or None,
-               }, context_instance=RequestContext(request))
+               })
 
 def redir(request, what):
        if what == 'open':
@@ -166,7 +168,7 @@ def commitfest(request, cfid):
        # the user is logged in. XXX: Figure out how to avoid doing that..
        form = CommitFestFilterForm(cf, request.GET)
 
-       return render_to_response('commitfest.html', {
+       return render(request, 'commitfest.html', {
                'cf': cf,
                'form': form,
                'patches': patches,
@@ -178,7 +180,7 @@ def commitfest(request, cfid):
                'openpatchids': [p.id for p in patches if p.is_open],
                'header_activity': 'Activity log',
                'header_activity_link': 'activity/',
-               }, context_instance=RequestContext(request))
+               })
 
 def global_search(request):
        if not request.GET.has_key('searchterm'):
@@ -187,10 +189,10 @@ def global_search(request):
 
        patches = Patch.objects.select_related().filter(name__icontains=searchterm).order_by('created',)
 
-       return render_to_response('patchsearch.html', {
+       return render(request, 'patchsearch.html', {
                'patches': patches,
                'title': 'Patch search results',
-               }, context_instance=RequestContext(request))
+               })
 
 def patch(request, cfid, patchid):
        cf = get_object_or_404(CommitFest, pk=cfid)
@@ -216,7 +218,7 @@ def patch(request, cfid, patchid):
                is_reviewer = False
                is_subscribed = False
 
-       return render_to_response('patch.html', {
+       return render(request, 'patch.html', {
                'cf': cf,
                'patch': patch,
                'patch_commitfests': patch_commitfests,
@@ -228,7 +230,7 @@ def patch(request, cfid, patchid):
                'attachnow': request.GET.has_key('attachthreadnow'),
                'title': patch.name,
                'breadcrumbs': [{'title': cf.title, 'href': '/%s/' % cf.pk},],
-               }, context_instance=RequestContext(request))
+               })
 
 @login_required
 @transaction.atomic
@@ -259,14 +261,14 @@ def patchform(request, cfid, patchid):
        else:
                form = PatchForm(instance=patch)
 
-       return render_to_response('base_form.html', {
+       return render(request, 'base_form.html', {
                'cf': cf,
                'form': form,
                'patch': patch,
                'title': 'Edit patch',
                'breadcrumbs': [{'title': cf.title, 'href': '/%s/' % cf.pk},
                                                {'title': 'View patch', 'href': '/%s/%s/' % (cf.pk, patch.pk)}],
-       }, context_instance=RequestContext(request))
+       })
 
 @login_required
 @transaction.atomic
@@ -301,13 +303,13 @@ def newpatch(request, cfid):
        else:
                form = NewPatchForm()
 
-       return render_to_response('base_form.html', {
+       return render(request, 'base_form.html', {
                'form': form,
                'title': 'New patch',
                'breadcrumbs': [{'title': cf.title, 'href': '/%s/' % cf.pk},],
                'savebutton': 'Create patch',
                'threadbrowse': True,
-       }, context_instance=RequestContext(request))
+       })
 
 def _review_status_string(reviewstatus):
        if '0' in reviewstatus:
@@ -402,7 +404,7 @@ def comment(request, cfid, patchid, what):
                        messages.add_message(request, messages.ERROR, "Failed to build list of response options from the archives: %s" % e)
                        return HttpResponseRedirect('/%s/%s/' % (cf.id, patch.id))
 
-       return render_to_response('base_form.html', {
+       return render(request, 'base_form.html', {
                'cf': cf,
                'form': form,
                'patch': patch,
@@ -412,7 +414,7 @@ def comment(request, cfid, patchid, what):
                'title': "Add %s" % what,
                'note': '<b>Note!</b> This form will generate an email to the public mailinglist <i>%s</i>, with sender set to <i>%s</i>!' % (settings.HACKERS_EMAIL, UserWrapper(request.user).email),
                'savebutton': 'Send %s' % what,
-       }, context_instance=RequestContext(request))
+       })
 
 @login_required
 @transaction.atomic
@@ -653,10 +655,10 @@ def send_email(request, cfid):
        if len(reviewers):
                messages.add_message(request, messages.INFO, "The email will be sent to the following reviewers: %s" % ", ".join([_user_and_mail(u) for u in reviewers]))
 
-       return render_to_response('base_form.html', {
+       return render(request, 'base_form.html', {
                'cf': cf,
                'form': form,
                'title': 'Send email',
                'breadcrumbs': [{'title': cf.title, 'href': '/%s/' % cf.pk},],
                'savebutton': 'Send email',
-       }, context_instance=RequestContext(request))
+       })

diff --git a/pgcommitfest/mailqueue/util.py b/pgcommitfest/mailqueue/util.py
index b0601c6da12a88e2a5aaa8fdd8e3aa9816499b9a..9d587507e80ff203cff72bc0a069f88991b48ee4 100644 (file)
--- a/pgcommitfest/mailqueue/util.py
+++ b/pgcommitfest/mailqueue/util.py
@@ -1,4 +1,3 @@
-from django.template import Context
 from django.template.loader import get_template
 
 from email.mime.text import MIMEText
@@ -42,5 +41,5 @@ def send_mail(sender, receiver, fullmsg):
 
 def send_template_mail(sender, senderaccountname, receiver, subject, templatename, templateattr={}, usergenerated=False):
        send_simple_mail(sender, receiver, subject,
-                                        get_template(templatename).render(Context(templateattr)),
+                                        get_template(templatename).render(templateattr),
                                         senderaccountname)

diff --git a/pgcommitfest/userprofile/views.py b/pgcommitfest/userprofile/views.py
index 7dac00c6114e71d568518de41f47f6539dff6c89..ced36b7589b15d4b2644be501eed73f396f52902 100644 (file)
--- a/pgcommitfest/userprofile/views.py
+++ b/pgcommitfest/userprofile/views.py
@@ -1,4 +1,4 @@
-from django.shortcuts import render_to_response
+from django.shortcuts import render
 from django.http import HttpResponseRedirect
 from django.template import RequestContext
 from django.db import transaction
@@ -55,11 +55,11 @@ def userprofile(request):
 
        extramails = UserExtraEmail.objects.filter(user=request.user)
 
-       return render_to_response('userprofileform.html', {
+       return render(request, 'userprofileform.html', {
                'form': form,
                'extramails': extramails,
                'mailform': mailform,
-               }, context_instance=RequestContext(request))
+               })
 
 @login_required
 @transaction.atomic