X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/e3d5bf5183811c60ba2aeabc65fa13c7c57b90e5..a914aa2c68ea9b734510a210503b85d1f3869581:/wtem/management/commands/wtem_email_teachers.py?ds=sidebyside diff --git a/wtem/management/commands/wtem_email_teachers.py b/wtem/management/commands/wtem_email_teachers.py index 3aba80d..9b5e5e9 100644 --- a/wtem/management/commands/wtem_email_teachers.py +++ b/wtem/management/commands/wtem_email_teachers.py @@ -1,14 +1,10 @@ # -*- coding: utf-8 -*- -import sys -from optparse import make_option - -from django.core.management.base import BaseCommand, CommandError -from django.conf import settings -from django.core.mail import send_mail +from django.core.management.base import BaseCommand from django.template.loader import render_to_string from contact.models import Contact +from wtem.management.commands import send_mail class Command(BaseCommand): @@ -16,12 +12,13 @@ class Command(BaseCommand): sent = 0 failed = 0 - query = Contact.objects.filter(form_tag = 'wtem').order_by('contact').distinct('contact') + query = Contact.objects.filter(form_tag='wtem').order_by('contact').distinct('contact') template_name = args[0] message = render_to_string('wtem/' + template_name + '.txt') subject = render_to_string('wtem/' + template_name + '_subject.txt') - answer = raw_input('Send the following to %d teachers with subject "%s"\n\n %s\n\n?' % \ + answer = raw_input( + 'Send the following to %d teachers with subject "%s"\n\n %s\n\n?' % (query.count(), subject.encode('utf8'), message.encode('utf8'))) if answer == 'yes': @@ -39,11 +36,5 @@ class Command(BaseCommand): def send_message(self, message, subject, email): self.stdout.write('>>> sending to %s' % email) - send_mail( - subject, - message, - getattr(settings, 'WTEM_CONTACT_EMAIL', 'no-reply@edukacjamedialna.edu.pl'), - [email], - fail_silently=False - ) + send_mail(subject=subject, body=message, to=[email])