From 8a81d4859d5bbcd6b5485b35d84a39d687751be9 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 1 Apr 2015 09:23:37 +0200 Subject: [PATCH] The use of Context is deprecated since Django 1.8 --- src/pretix/base/payment.py | 3 +-- src/pretix/plugins/banktransfer/payment.py | 11 +++++------ src/pretix/plugins/paypal/payment.py | 13 ++++++------- src/pretix/plugins/stripe/payment.py | 13 ++++++------- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/pretix/base/payment.py b/src/pretix/base/payment.py index 62007953f7..40d1495e92 100644 --- a/src/pretix/base/payment.py +++ b/src/pretix/base/payment.py @@ -4,7 +4,6 @@ from django import forms from django.forms import Form from django.http import HttpRequest -from django.template import Context from django.template.loader import get_template from django.utils.translation import ugettext_lazy as _ from pretix.base.forms import SettingsForm @@ -156,7 +155,7 @@ class BasePaymentProvider: """ form = self.checkout_form(request) template = get_template('pretixpresale/event/checkout_payment_form_default.html') - ctx = Context({'request': request, 'form': form}) + ctx = {'request': request, 'form': form} return template.render(ctx) def checkout_confirm_render(self, request) -> str: diff --git a/src/pretix/plugins/banktransfer/payment.py b/src/pretix/plugins/banktransfer/payment.py index 886de53525..0b724b61fa 100644 --- a/src/pretix/plugins/banktransfer/payment.py +++ b/src/pretix/plugins/banktransfer/payment.py @@ -1,6 +1,5 @@ from collections import OrderedDict import json -from django.template import Context from django.template.loader import get_template from django.utils.translation import ugettext_lazy as _ from django import forms @@ -27,7 +26,7 @@ class BankTransfer(BasePaymentProvider): def checkout_form_render(self, request) -> str: template = get_template('pretixplugins/banktransfer/checkout_payment_form.html') - ctx = Context({'request': request, 'event': self.event, 'settings': self.settings}) + ctx = {'request': request, 'event': self.event, 'settings': self.settings} return template.render(ctx) def checkout_prepare(self, request, total): @@ -39,12 +38,12 @@ class BankTransfer(BasePaymentProvider): def checkout_confirm_render(self, request): form = self.checkout_form(request) template = get_template('pretixplugins/banktransfer/checkout_payment_confirm.html') - ctx = Context({'request': request, 'form': form, 'settings': self.settings}) + ctx = {'request': request, 'form': form, 'settings': self.settings} return template.render(ctx) def order_pending_render(self, request, order) -> str: template = get_template('pretixplugins/banktransfer/pending.html') - ctx = Context({'request': request, 'order': order, 'settings': self.settings}) + ctx = {'request': request, 'order': order, 'settings': self.settings} return template.render(ctx) def order_control_render(self, request, order) -> str: @@ -54,6 +53,6 @@ class BankTransfer(BasePaymentProvider): else: payment_info = None template = get_template('pretixplugins/banktransfer/control.html') - ctx = Context({'request': request, 'event': self.event, 'settings': self.settings, - 'payment_info': payment_info, 'order': order}) + ctx = {'request': request, 'event': self.event, 'settings': self.settings, + 'payment_info': payment_info, 'order': order} return template.render(ctx) diff --git a/src/pretix/plugins/paypal/payment.py b/src/pretix/plugins/paypal/payment.py index 091da3e071..7e5dbe5063 100644 --- a/src/pretix/plugins/paypal/payment.py +++ b/src/pretix/plugins/paypal/payment.py @@ -3,7 +3,6 @@ import json import logging from django.contrib import messages from django.core.urlresolvers import reverse -from django.template import Context from django.template.loader import get_template from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext as __ @@ -63,7 +62,7 @@ class Paypal(BasePaymentProvider): def checkout_form_render(self, request) -> str: template = get_template('pretixplugins/paypal/checkout_payment_form.html') - ctx = Context({'request': request, 'event': self.event, 'settings': self.settings}) + ctx = {'request': request, 'event': self.event, 'settings': self.settings} return template.render(ctx) def checkout_prepare(self, request, cart): @@ -130,7 +129,7 @@ class Paypal(BasePaymentProvider): on the 'confirm order' page. """ template = get_template('pretixplugins/paypal/checkout_payment_confirm.html') - ctx = Context({'request': request, 'event': self.event, 'settings': self.settings}) + ctx = {'request': request, 'event': self.event, 'settings': self.settings} return template.render(ctx) def checkout_perform(self, request, order) -> str: @@ -191,8 +190,8 @@ class Paypal(BasePaymentProvider): except KeyError: pass template = get_template('pretixplugins/paypal/pending.html') - ctx = Context({'request': request, 'event': self.event, 'settings': self.settings, - 'retry': retry, 'order': order}) + ctx = {'request': request, 'event': self.event, 'settings': self.settings, + 'retry': retry, 'order': order} return template.render(ctx) def order_control_render(self, request, order) -> str: @@ -201,6 +200,6 @@ class Paypal(BasePaymentProvider): else: payment_info = None template = get_template('pretixplugins/paypal/control.html') - ctx = Context({'request': request, 'event': self.event, 'settings': self.settings, - 'payment_info': payment_info, 'order': order}) + ctx = {'request': request, 'event': self.event, 'settings': self.settings, + 'payment_info': payment_info, 'order': order} return template.render(ctx) diff --git a/src/pretix/plugins/stripe/payment.py b/src/pretix/plugins/stripe/payment.py index a6b70c591a..ab13941b01 100644 --- a/src/pretix/plugins/stripe/payment.py +++ b/src/pretix/plugins/stripe/payment.py @@ -2,7 +2,6 @@ from collections import OrderedDict import json import logging from django.contrib import messages -from django.template import Context from django.template.loader import get_template from django.utils.translation import ugettext_lazy as _ from django import forms @@ -49,7 +48,7 @@ class Stripe(BasePaymentProvider): def checkout_form_render(self, request) -> str: template = get_template('pretixplugins/stripe/checkout_payment_form.html') - ctx = Context({'request': request, 'event': self.event, 'settings': self.settings}) + ctx = {'request': request, 'event': self.event, 'settings': self.settings} return template.render(ctx) def _init_api(self): @@ -57,7 +56,7 @@ class Stripe(BasePaymentProvider): def checkout_confirm_render(self, request) -> str: template = get_template('pretixplugins/stripe/checkout_payment_confirm.html') - ctx = Context({'request': request, 'event': self.event, 'settings': self.settings}) + ctx = {'request': request, 'event': self.event, 'settings': self.settings} return template.render(ctx) def checkout_perform(self, request, order) -> str: @@ -80,8 +79,8 @@ class Stripe(BasePaymentProvider): def order_pending_render(self, request, order) -> str: template = get_template('pretixplugins/stripe/pending.html') - ctx = Context({'request': request, 'event': self.event, 'settings': self.settings, - 'order': order}) + ctx = {'request': request, 'event': self.event, 'settings': self.settings, + 'order': order} return template.render(ctx) def order_control_render(self, request, order) -> str: @@ -91,6 +90,6 @@ class Stripe(BasePaymentProvider): else: payment_info = None template = get_template('pretixplugins/stripe/control.html') - ctx = Context({'request': request, 'event': self.event, 'settings': self.settings, - 'payment_info': payment_info, 'order': order}) + ctx = {'request': request, 'event': self.event, 'settings': self.settings, + 'payment_info': payment_info, 'order': order} return template.render(ctx)