~roadmr/canonical-identity-provider/fix-deprecation-warnings-1

« back to all changes in this revision

Viewing changes to src/identityprovider/emailutils.py

  • Committer: Tom Wardill
  • Date: 2018-02-14 14:05:59 UTC
  • mfrom: (1602 work)
  • mto: (1597.1.44 django-1.10)
  • mto: This revision was merged to the branch mainline in revision 1603.
  • Revision ID: tom.wardill@canonical.com-20180214140559-ow5txzwy46nopws2
Merge flake8 changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
from urlparse import urljoin
6
6
 
7
7
from django.conf import settings
 
8
from django.core.mail import send_mail
8
9
from django.core.urlresolvers import reverse
9
 
from django.core.mail import send_mail
10
10
from django.template.loader import render_to_string
11
11
from django.utils.timezone import now
12
12
from django.utils.translation import ugettext_lazy as _