From 00810cdfab81b3c9845d1dbb8c0e66309b6b4a92 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 26 Sep 2016 18:47:30 +0200 Subject: [PATCH] Stop instantiating context objects as it is deprecated --- src/pretix/base/views/errors.py | 5 ++--- src/pretix/plugins/banktransfer/signals.py | 4 +--- src/pretix/plugins/pretixdroid/signals.py | 4 +--- src/pretix/plugins/stripe/signals.py | 3 +-- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/pretix/base/views/errors.py b/src/pretix/base/views/errors.py index 174400762d..8851597eba 100644 --- a/src/pretix/base/views/errors.py +++ b/src/pretix/base/views/errors.py @@ -1,13 +1,12 @@ from django.http import HttpResponseForbidden from django.middleware.csrf import REASON_NO_CSRF_COOKIE, REASON_NO_REFERER -from django.template import Context from django.template.loader import get_template from django.utils.translation import ugettext as _ def csrf_failure(request, reason=""): t = get_template('csrffail.html') - c = Context({ + c = { 'reason': reason, 'no_referer': reason == REASON_NO_REFERER, 'no_referer1': _( @@ -29,5 +28,5 @@ def csrf_failure(request, reason=""): "If you have configured your browser to disable cookies, please " "re-enable them, at least for this site, or for 'same-origin' " "requests."), - }) + } return HttpResponseForbidden(t.render(c), content_type='text/html') diff --git a/src/pretix/plugins/banktransfer/signals.py b/src/pretix/plugins/banktransfer/signals.py index b31fc531e4..a35a732b09 100644 --- a/src/pretix/plugins/banktransfer/signals.py +++ b/src/pretix/plugins/banktransfer/signals.py @@ -1,6 +1,5 @@ from django.core.urlresolvers import resolve, reverse from django.dispatch import receiver -from django.template import Context from django.template.loader import get_template from django.utils.translation import ugettext_lazy as _ @@ -38,7 +37,6 @@ def html_head_presale(sender, request=None, **kwargs): url = resolve(request.path_info) if url.namespace == 'plugins:banktransfer': template = get_template('pretixplugins/banktransfer/control_head.html') - ctx = Context({}) - return template.render(ctx) + return template.render({}) else: return "" diff --git a/src/pretix/plugins/pretixdroid/signals.py b/src/pretix/plugins/pretixdroid/signals.py index c24ced06c1..aeb9b7a20b 100644 --- a/src/pretix/plugins/pretixdroid/signals.py +++ b/src/pretix/plugins/pretixdroid/signals.py @@ -1,6 +1,5 @@ from django.core.urlresolvers import resolve, reverse from django.dispatch import receiver -from django.template import Context from django.template.loader import get_template from django.utils.translation import ugettext_lazy as _ @@ -30,7 +29,6 @@ def html_head_presale(sender, request=None, **kwargs): url = resolve(request.path_info) if url.namespace == 'plugins:pretixdroid': template = get_template('pretixplugins/pretixdroid/control_head.html') - ctx = Context({}) - return template.render(ctx) + return template.render({}) else: return "" diff --git a/src/pretix/plugins/stripe/signals.py b/src/pretix/plugins/stripe/signals.py index 6d2d11e107..a841765ed0 100644 --- a/src/pretix/plugins/stripe/signals.py +++ b/src/pretix/plugins/stripe/signals.py @@ -2,7 +2,6 @@ import json from django.core.urlresolvers import resolve from django.dispatch import receiver -from django.template import Context from django.template.loader import get_template from django.utils.translation import ugettext_lazy as _ @@ -25,7 +24,7 @@ def html_head_presale(sender, request=None, **kwargs): url = resolve(request.path_info) if provider.is_enabled and ("checkout" in url.url_name or "order.pay" in url.url_name): template = get_template('pretixplugins/stripe/presale_head.html') - ctx = Context({'event': sender, 'settings': provider.settings}) + ctx = {'event': sender, 'settings': provider.settings} return template.render(ctx) else: return ""