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

« back to all changes in this revision

Viewing changes to src/identityprovider/middleware/xrds.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:
3
3
 
4
4
from urlparse import urlparse
5
5
 
6
 
from openid.yadis.accept import getAcceptable
7
 
from openid.yadis.constants import YADIS_CONTENT_TYPE, YADIS_HEADER_NAME
8
 
 
9
6
from django.core.urlresolvers import resolve, reverse
10
7
from django.http import Http404, HttpResponse
11
8
from django.shortcuts import get_object_or_404
12
9
from django.template.loader import render_to_string
13
10
 
 
11
from openid.yadis.accept import getAcceptable
 
12
from openid.yadis.constants import YADIS_CONTENT_TYPE, YADIS_HEADER_NAME
 
13
 
14
14
from identityprovider.models import Account
15
15
from identityprovider.utils import get_provider_url
16
16