Revision aab4d540 snf-astakos-app/astakos/im/api/admin.py
b/snf-astakos-app/astakos/im/api/admin.py | ||
---|---|---|
35 | 35 |
|
36 | 36 |
from functools import wraps |
37 | 37 |
from time import time, mktime |
38 |
from urlparse import urlparse |
|
39 |
from collections import defaultdict |
|
40 | 38 |
|
41 | 39 |
from django.http import HttpResponse |
42 | 40 |
from django.utils import simplejson as json |
43 | 41 |
|
44 |
from astakos.im.api.faults import * |
|
45 |
from astakos.im.api import render_fault |
|
46 |
from astakos.im.models import AstakosUser, Service |
|
42 |
from astakos.im.api.faults import (Fault, Unauthorized, InternalServerError, BadRequest, |
|
43 |
Forbidden) |
|
44 |
from astakos.im.api import render_fault, _get_user_by_email, _get_user_by_username |
|
45 |
from astakos.im.models import AstakosUser |
|
47 | 46 |
from astakos.im.util import epoch |
48 |
from astakos.im.api import _get_user_by_email, _get_user_by_username |
|
49 | 47 |
|
50 | 48 |
logger = logging.getLogger(__name__) |
51 | 49 |
format = ('%a, %d %b %Y %H:%M:%S GMT') |
Also available in: Unified diff