Use render instead of render_to_response in some apps

For accounting, elections, invoices and memberships use the new way of
doing rendering. This is a backwards compatible mechanical change for
the simple apps.

4 files changed, 49 insertions, 53 deletions

diff --git a/postgresqleu/accounting/views.py b/postgresqleu/accounting/views.py
index 637d0838..90881a7e 100644
--- a/postgresqleu/accounting/views.py
+++ b/postgresqleu/accounting/views.py
@@ -1,8 +1,7 @@
 from django.http import HttpResponseRedirect, Http404
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages
-from django.shortcuts import render_to_response, get_object_or_404
-from django.template import RequestContext
+from django.shortcuts import render, get_object_or_404
 from django.forms.models import inlineformset_factory
 from django.db.models import Max
 from django.db import connection, transaction
@@ -74,7 +73,7 @@ def year(request, year):
 	paginator = EntryPaginator(entries)
 	currpage = request.GET.has_key('p') and int(request.GET['p']) or 1
 
-	return render_to_response('accounting/main.html', {
+	return render(request, 'accounting/main.html', {
 		'entries': paginator.page(currpage),
 		'page': currpage,
 		'pages': paginator.get_pages(currpage),
@@ -83,7 +82,7 @@ def year(request, year):
 		'year': year,
 		'years': Year.objects.all(),
 		'searchterm': searchterm,
-		}, RequestContext(request))
+		})
 
 @login_required
 @transaction.atomic
@@ -161,7 +160,7 @@ def entry(request, entryid):
 	totals = (sum([i.amount for i in items if i.amount>0]),
 			  -sum([i.amount for i in items if i.amount<0]))
 	urls = list(entry.journalurl_set.all())
-	return render_to_response('accounting/main.html', {
+	return render(request, 'accounting/main.html', {
 		'entries': paginator.page(currpage),
 		'page': currpage,
 		'pages': paginator.get_pages(currpage),
@@ -177,7 +176,7 @@ def entry(request, entryid):
 		'urlformset': urlformset,
 		'years': Year.objects.all(),
 		'searchterm': searchterm,
-		}, RequestContext(request))
+		})
 
 def _get_balance_query(objstr='', includeopen=False):
 	q = """WITH currentyear AS (
@@ -349,14 +348,14 @@ SELECT ac.name AS acname, ag.name AS agname, anum, a.name,
 
 			return HttpResponseRedirect('/accounting/%s/' % year.year)
 
-	return render_to_response('accounting/closeyear.html', {
+	return render(request, 'accounting/closeyear.html', {
 		'year': year,
 		'hasopen': hasopen,
 		'hasnext': hasnext,
 		'outgoingbalance': balance,
 		'yearresult': yearresult,
 		'accounts': Account.objects.filter(group__accountclass__inbalance=True),
-	}, context_instance=RequestContext(request))
+	})
 
 @login_required
 @transaction.atomic
@@ -462,7 +461,7 @@ def report(request, year, reporttype):
 				lastaccount = row[0]
 			items[-1]['entries'].append(dict(zip([col[0] for col in curs.description[4:]], row[4:])))
 
-		return render_to_response('accounting/ledgerreport.html', {
+		return render(request, 'accounting/ledgerreport.html', {
 			'year': year,
 			'years': years,
 			'objects': filtered_objects,
@@ -473,7 +472,7 @@ def report(request, year, reporttype):
 			'items': items,
 			'enddate': enddate,
 			'includeopen': includeopen,
-		}, context_instance=RequestContext(request))
+		})
 	elif reporttype == 'results':
 		# The results report is the easiest one, since we can assume that
 		# all accounts enter the year with a value 0. Therefor, we only
@@ -518,7 +517,7 @@ def report(request, year, reporttype):
 		raise Http404("Unknown report")
 
 	# XXX: PDF maybe?
-	return render_to_response('accounting/yearreports.html', {
+	return render(request, 'accounting/yearreports.html', {
 		'reporttype': reporttype,
 		'title': title,
 		'year': year and year or -1,
@@ -532,4 +531,4 @@ def report(request, year, reporttype):
 		'currentobj': object,
 		'enddate': enddate,
 		'includeopen': includeopen,
-	}, context_instance=RequestContext(request))
+	})
diff --git a/postgresqleu/elections/views.py b/postgresqleu/elections/views.py
index 87ea042e..743f02f9 100644
--- a/postgresqleu/elections/views.py
+++ b/postgresqleu/elections/views.py
@@ -1,6 +1,5 @@
-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponseRedirect, Http404
-from django.template import RequestContext
 from django.contrib.auth.decorators import login_required
 from django.db import connection
 
@@ -14,11 +13,11 @@ def home(request):
 	past_elections = [e for e in elections if e.startdate<date.today() and e.enddate<date.today()]
 	upcoming_elections = [e for e in elections if e.startdate>date.today()]
 
-	return render_to_response('elections/home.html', {
+	return render(request, 'elections/home.html', {
 			'open': open_elections,
 			'past': past_elections,
 			'upcoming': upcoming_elections,
-	}, context_instance=RequestContext(request))
+	})
 
 def election(request, electionid):
 	election = get_object_or_404(Election, pk=electionid)
@@ -45,11 +44,11 @@ def election(request, electionid):
 		if len(res) == 0:
 			raise Http404('No results found for this election')
 
-		return render_to_response('elections/results.html', {
+		return render(request, 'elections/results.html', {
 				'election': election,
 				'topscore': res[0][1],
 				'scores': [{'name': r[0], 'score': r[1], 'width': 300*r[1]/res[0][1]} for r in res],
-				}, context_instance=RequestContext(request))
+				})
 
 	if len(election.candidate_set.all()) <= 0:
 		raise Http404("This election has no candidates!")
@@ -63,24 +62,24 @@ def election(request, electionid):
 
 		# Make sure member has paid
 		if not member.paiduntil:
-			return render_to_response('elections/mustbemember.html', {},
+			return render(request, 'elections/mustbemember.html', {},
 									  context_instance=RequestContext(request))
 
 		# Make sure that the membership hasn't expired
 		if member.paiduntil < date.today():
-			return render_to_response('elections/mustbemember.html', {},
+			return render(request, 'elections/mustbemember.html', {},
 									  context_instance=RequestContext(request))
 
 		# Verify that the user has been a member for at least 28 days.
 		if member.membersince > election.startdate - timedelta(days=28):
-			return render_to_response('elections/memberfourweeks.html', {
+			return render(request, 'elections/memberfourweeks.html', {
 					'registered_at': member.paiduntil - timedelta(days=365),
 					'mustregbefore': election.startdate - timedelta(days=28),
 					'election': election,
-					}, context_instance=RequestContext(request))
+					})
 
 	except Member.DoesNotExist:
-		return render_to_response('elections/mustbemember.html', {},
+		return render(request, 'elections/mustbemember.html', {},
 								  context_instance=RequestContext(request))
 
 	if request.method == "POST":
@@ -93,17 +92,17 @@ def election(request, electionid):
 		form = VoteForm(election, member)
 
 
-	return render_to_response('elections/form.html', {
+	return render(request, 'elections/form.html', {
 			'form': form,
 			'election': election,
-	}, context_instance=RequestContext(request))
+	})
 
 def candidate(request, election, candidate):
 	candidate = get_object_or_404(Candidate, election=election, pk=candidate)
 
-	return render_to_response('elections/candidate.html', {
+	return render(request, 'elections/candidate.html', {
 			'candidate': candidate,
-	}, context_instance=RequestContext(request))
+	})
 
 @login_required
 def ownvotes(request, electionid):
@@ -118,7 +117,7 @@ def ownvotes(request, electionid):
 
 	votes = Vote.objects.select_related().filter(voter=member, election=election).order_by('-score')
 
-	return render_to_response('elections/ownvotes.html', {
+	return render(request, 'elections/ownvotes.html', {
 			'election': election,
 			'votes': votes,
-	}, context_instance=RequestContext(request))
+	})
diff --git a/postgresqleu/invoices/views.py b/postgresqleu/invoices/views.py
index 77cdf113..9510e78c 100644
--- a/postgresqleu/invoices/views.py
+++ b/postgresqleu/invoices/views.py
@@ -1,11 +1,10 @@
 from django.core.paginator import Paginator, EmptyPage, InvalidPage
-from django.shortcuts import render, render_to_response, get_object_or_404
+from django.shortcuts import render, get_object_or_404
 from django.forms.models import inlineformset_factory
 from django.http import HttpResponseRedirect, HttpResponse, HttpResponseForbidden
 from django.contrib.auth.decorators import login_required
 from django.db import transaction
 from django.db.models import Q, Count, Max
-from django.template import RequestContext
 from django.contrib import messages
 from django.conf import settings
 
@@ -59,14 +58,14 @@ def _homeview(request, invoice_objects, unpaid=False, pending=False, deleted=Fal
 	except (EmptyPage, InvalidPage):
 		invoices = paginator.page(paginator.num_pages)
 
-	return render_to_response('invoices/home.html', {
+	return render(request, 'invoices/home.html', {
 			'invoices': invoices,
 			'unpaid': unpaid,
 			'pending': pending,
 			'deleted': deleted,
 			'refunded': refunded,
 			'searchterm': searchterm,
-			}, context_instance=RequestContext(request))
+			})
 
 
 @login_required
@@ -175,13 +174,13 @@ def oneinvoice(request, invoicenum):
 			)
 		formset = InvoiceRowInlineFormset(instance=invoice)
 
-	return render_to_response('invoices/invoiceform.html', {
+	return render(request, 'invoices/invoiceform.html', {
 			'form': form,
 			'formset': formset,
 			'invoice': invoice,
 			'currency_symbol': settings.CURRENCY_SYMBOL,
 			'vatrates': VatRate.objects.all(),
-			}, context_instance=RequestContext(request))
+			})
 
 @login_required
 @user_passes_test_or_error(lambda u: u.has_module_perms('invoices'))
@@ -336,16 +335,16 @@ def viewinvoice(request, invoiceid):
 	if not (request.user.has_module_perms('invoices') or invoice.recipient_user == request.user):
 		return HttpResponseForbidden("Access denied")
 
-	return render_to_response('invoices/userinvoice.html', {
+	return render(request, 'invoices/userinvoice.html', {
 			'invoice': InvoicePresentationWrapper(invoice, "%s/invoices/%s/" % (settings.SITEBASE, invoice.pk)),
-			}, context_instance=RequestContext(request))
+			})
 
 def viewinvoice_secret(request, invoiceid, invoicesecret):
 	invoice = get_object_or_404(Invoice, pk=invoiceid, deleted=False, finalized=True, recipient_secret=invoicesecret)
-	return render_to_response('invoices/userinvoice.html', {
+	return render(request, 'invoices/userinvoice.html', {
 			'invoice': InvoicePresentationWrapper(invoice, "%s/invoices/%s/%s/" % (settings.SITEBASE, invoice.pk, invoice.recipient_secret)),
 			'fromsecret': True,
-			}, context_instance=RequestContext(request))
+			})
 
 @login_required
 def viewinvoicepdf(request, invoiceid):
@@ -398,17 +397,17 @@ def viewrefundnote_secret(request, invoiceid, invoicesecret):
 @login_required
 def userhome(request):
 	invoices = Invoice.objects.filter(recipient_user=request.user, deleted=False, finalized=True)
-	return render_to_response('invoices/userhome.html', {
+	return render(request, 'invoices/userhome.html', {
 			'invoices': invoices,
-			}, context_instance=RequestContext(request))
+			})
 
 @login_required
 def banktransfer(request):
-	return render_to_response('invoices/banktransfer.html', {
+	return render(request, 'invoices/banktransfer.html', {
 			'title': request.GET['title'],
 			'amount': request.GET['amount'],
 			'returnurl': request.GET['ret'],
-			}, context_instance=RequestContext(request))
+			})
 
 @login_required
 @transaction.atomic
diff --git a/postgresqleu/membership/views.py b/postgresqleu/membership/views.py
index 5306827e..00e94952 100644
--- a/postgresqleu/membership/views.py
+++ b/postgresqleu/membership/views.py
@@ -1,6 +1,5 @@
-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponse, HttpResponseRedirect
-from django.template import RequestContext
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages
 from django.conf import settings
@@ -95,21 +94,21 @@ def home(request):
 
 	logdata = MemberLog.objects.filter(member=member).order_by('-timestamp')[:30]
 
-	return render_to_response('membership/index.html', {
+	return render(request, 'membership/index.html', {
 		'form': form,
 		'member': member,
 		'invoice': InvoicePresentationWrapper(member.activeinvoice, "%s/membership/" % settings.SITEBASE),
 		'registration_complete': registration_complete,
 		'logdata': logdata,
 		'amount': settings.MEMBERSHIP_COST, # price for settings.MEMBERSHIP_LENGTH years
-	}, context_instance=RequestContext(request))
+	})
 
 
 def userlist(request):
 	members = Member.objects.select_related('country').filter(listed=True, paiduntil__gt=datetime.now()).order_by('fullname')
-	return render_to_response('community/userlist.html', {
+	return render(request, 'community/userlist.html', {
 		'members': members,
-	}, context_instance=RequestContext(request))
+	})
 
 
 # Admin view that's used to send email to multiple users
@@ -137,10 +136,10 @@ def admin_email(request):
 		ids = ids.split(',')
 
 	recipients = [m.user.email for m in Member.objects.filter(pk__in=ids)]
-	return render_to_response('membership/admin_email.html', {
+	return render(request, 'membership/admin_email.html', {
 		'form': form,
 		'recipientlist': ', '.join(recipients),
-		}, RequestContext(request))
+		})
 
 @login_required
 def meetings(request):
@@ -149,7 +148,7 @@ def meetings(request):
 	q = Q(dateandtime__gte=datetime.now()-timedelta(hours=4)) & (Q(allmembers=True) | Q(members=member))
 	meetings = Meeting.objects.filter(q).order_by('dateandtime')
 
-	return render_to_response('membership/meetings.html', {
+	return render(request, 'membership/meetings.html', {
 		'active': member.paiduntil and member.paiduntil >= datetime.today().date(),
 		'member': member,
 		'meetings': meetings,
@@ -186,7 +185,7 @@ def meeting(request, meetingid):
 		key.key = base64.urlsafe_b64encode(os.urandom(40)).rstrip('=')
 		key.save()
 
-	return render_to_response('membership/meeting.html', {
+	return render(request, 'membership/meeting.html', {
 		'member': member,
 		'meeting': meeting,
 		'key': key,