Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail

This commit is contained in:
Martin Pépin 2016-12-23 16:08:41 +01:00
commit a5b6901972
3 changed files with 2 additions and 7 deletions

View file

@ -3,7 +3,7 @@
import calendar import calendar
import random import random
from datetime import timedelta from datetime import timedelta
from custommail.shortcuts import send_custom_mail, send_mass_custom_mail from custommail.shortcuts import send_mass_custom_mail
from django.contrib.sites.models import Site from django.contrib.sites.models import Site
from django.db import models from django.db import models

View file

@ -1,14 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import random import random
import hashlib import hashlib
import time import time
from datetime import timedelta from datetime import timedelta
from custommail.shortcuts import ( from custommail.shortcuts import (
send_mass_custom_mail, send_custom_mail, render_custom_mail send_mass_custom_mail, send_custom_mail, render_custom_mail
) )

View file

@ -1,8 +1,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from datetime import datetime
import base64 import base64
import json import json
from datetime import datetime
from captcha.fields import ReCaptchaField from captcha.fields import ReCaptchaField
from custommail.shortcuts import render_custom_mail from custommail.shortcuts import render_custom_mail