diff options
author | Jelle van der Waa <jelle@vdwaa.nl> | 2018-02-16 22:28:22 +0100 |
---|---|---|
committer | Jelle van der Waa <jelle@vdwaa.nl> | 2018-04-08 12:51:19 +0200 |
commit | cbb242f6bbe64bd69f597ccaca252f32d177cbf1 (patch) | |
tree | 62e4e063d74fe7b3f52f396c788339f0aa80e4ad | |
parent | c976d7eb3004e5c15ddb1929f22fa3532f11b9e9 (diff) | |
download | archweb-cbb242f6bbe64bd69f597ccaca252f32d177cbf1.tar.gz archweb-cbb242f6bbe64bd69f597ccaca252f32d177cbf1.zip |
treewide: context must be a dict rather than Context
Passing Context has been removed in Django 11, a dict should rather be
passed.
-rw-r--r-- | devel/forms.py | 6 | ||||
-rw-r--r-- | news/views.py | 6 | ||||
-rw-r--r-- | packages/management/commands/signoff_report.py | 6 | ||||
-rw-r--r-- | packages/views/flag.py | 6 | ||||
-rw-r--r-- | todolists/views.py | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/devel/forms.py b/devel/forms.py index 73d725e5..db4428fa 100644 --- a/devel/forms.py +++ b/devel/forms.py @@ -6,7 +6,7 @@ from django import forms from django.contrib.auth.models import User, Group from django.contrib.sites.models import Site from django.core.mail import send_mail -from django.template import loader, Context +from django.template import loader from .models import UserProfile @@ -88,11 +88,11 @@ class NewUserForm(forms.ModelForm): self.save_m2m() template = loader.get_template('devel/new_account.txt') - ctx = Context({ + ctx = { 'site': Site.objects.get_current(), 'user': user, 'password': password, - }) + } send_mail("Your new archweb account", template.render(ctx), diff --git a/news/views.py b/news/views.py index f85db171..48295944 100644 --- a/news/views.py +++ b/news/views.py @@ -2,7 +2,7 @@ from django import forms from django.core.mail import send_mail from django.http import HttpResponse from django.shortcuts import get_object_or_404, redirect -from django.template import Context, loader +from django.template import loader from django.views.decorators.http import require_POST from django.views.generic import (DetailView, ListView, CreateView, UpdateView, DeleteView) @@ -40,9 +40,9 @@ class NewsCreateView(CreateView): newsitem.slug = find_unique_slug(News, newsitem.title) newsitem.save() if newsitem.send_announce: - ctx = Context({ + ctx = { 'news': newsitem, - }) + } template = loader.get_template('news/news_email_notification.txt') send_mail('[arch-announce] %s' % newsitem.title, template.render(ctx), diff --git a/packages/management/commands/signoff_report.py b/packages/management/commands/signoff_report.py index a5022eeb..6749cf40 100644 --- a/packages/management/commands/signoff_report.py +++ b/packages/management/commands/signoff_report.py @@ -14,7 +14,7 @@ from django.core.management.base import BaseCommand, CommandError from django.contrib.auth.models import User from django.contrib.sites.models import Site from django.db.models import Count -from django.template import loader, Context +from django.template import loader from django.utils.timezone import now from collections import namedtuple @@ -106,7 +106,7 @@ def generate_report(email, repo_name): subject = 'Signoff report for [%s]' % repo.name.lower() t = loader.get_template('packages/signoff_report.txt') - c = Context({ + c = { 'repo': repo, 'signoffs_url': signoffs_url, 'disabled': disabled, @@ -119,7 +119,7 @@ def generate_report(email, repo_name): 'old': old, 'old_days': old_days, 'leaders': leaders, - }) + } from_addr = 'Arch Website Notification <nobody@archlinux.org>' send_mail(subject, t.render(c), from_addr, [email]) diff --git a/packages/views/flag.py b/packages/views/flag.py index 9fe60e2c..172de24f 100644 --- a/packages/views/flag.py +++ b/packages/views/flag.py @@ -6,7 +6,7 @@ from django.contrib.auth.decorators import permission_required from django.core.mail import EmailMessage from django.db import transaction from django.shortcuts import get_object_or_404, redirect, render -from django.template import loader, Context +from django.template import loader from django.utils.timezone import now from django.views.decorators.cache import cache_page, never_cache @@ -116,12 +116,12 @@ def flag(request, name, repo, arch): if toemail: # send notification email to the maintainers tmpl = loader.get_template('packages/outofdate.txt') - ctx = Context({ + ctx = { 'email': email, 'message': message, 'pkg': pkg, 'packages': flagged_pkgs, - }) + } msg = EmailMessage(subject, tmpl.render(ctx), 'Arch Website Notification <nobody@archlinux.org>', diff --git a/todolists/views.py b/todolists/views.py index 75c3d2d6..40a767d1 100644 --- a/todolists/views.py +++ b/todolists/views.py @@ -9,7 +9,7 @@ from django.shortcuts import (get_list_or_404, get_object_or_404, from django.db import transaction from django.views.decorators.cache import never_cache from django.views.generic import DeleteView, ListView -from django.template import Context, loader +from django.template import loader from django.utils.timezone import now from main.models import Package, Repo @@ -225,10 +225,10 @@ def send_todolist_emails(todo_list, new_packages): for maint, packages in maint_packages.iteritems(): packages = sorted(packages, key=attrgetter('pkgname', 'arch')) - ctx = Context({ + ctx = { 'todo_packages': packages, 'todolist': todo_list, - }) + } template = loader.get_template('todolists/email_notification.txt') send_mail('Packages added to todo list \'%s\'' % todo_list.name, template.render(ctx), |