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

« back to all changes in this revision

Viewing changes to src/identityprovider/apiutils.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:
1
1
from __future__ import unicode_literals
2
2
 
 
3
from cStringIO import StringIO
3
4
from urlparse import urlparse
4
 
from cStringIO import StringIO
5
5
 
6
6
from django.conf import settings
7
7
from django.core.handlers.base import BaseHandler
17
17
from ssoclient.v2.http import ApiSession
18
18
 
19
19
from identityprovider.timeline_helpers import (
 
20
    get_request_timing_function,
20
21
    maybe_contextmanager,
21
 
    get_request_timing_function,
22
22
)
23
23
 
24
24