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

« back to all changes in this revision

Viewing changes to src/api/v10/handlers.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 __future__ import unicode_literals
5
5
 
 
6
import json
6
7
import logging
7
 
import json
8
 
 
9
8
from datetime import timedelta
10
9
 
11
10
from django.conf import settings
25
24
from api.v10.decorators import (
26
25
    api_user_required,
27
26
    check_leak,
 
27
    named_operation,
28
28
    plain_user_required,
29
 
    named_operation,
30
29
)
31
30
from api.v10.forms import WebserviceCreateAccountForm
32
31
from identityprovider import emailutils
79
78
                           cls=DateTimeAwareJSONEncoder, indent=4)
80
79
 
81
80
        return seria
 
81
 
 
82
 
82
83
Emitter.register('lazr.restful', LazrRestfulEmitter, 'application/json')
83
84
 
84
85