Revision aab4d540 snf-astakos-app/astakos/im/util.py
b/snf-astakos-app/astakos/im/util.py | ||
---|---|---|
36 | 36 |
import time |
37 | 37 |
|
38 | 38 |
from urllib import quote |
39 |
from urlparse import urlsplit, urlunsplit |
|
40 | 39 |
|
41 | 40 |
from datetime import tzinfo, timedelta |
42 | 41 |
from django.http import HttpResponse, HttpResponseBadRequest, urlencode |
... | ... | |
46 | 45 |
from django.core.urlresolvers import reverse |
47 | 46 |
from django.core.exceptions import ValidationError |
48 | 47 |
|
49 |
from astakos.im.models import AstakosUser, Invitation, ApprovalTerms
|
|
50 |
from astakos.im.settings import INVITATIONS_PER_LEVEL, COOKIE_NAME, \
|
|
48 |
from astakos.im.models import AstakosUser, Invitation |
|
49 |
from astakos.im.settings import COOKIE_NAME, \ |
|
51 | 50 |
COOKIE_DOMAIN, COOKIE_SECURE, FORCE_PROFILE_UPDATE, LOGGING_LEVEL |
52 | 51 |
from astakos.im.functions import login |
53 | 52 |
|
54 | 53 |
logger = logging.getLogger(__name__) |
55 | 54 |
|
56 | 55 |
class UTC(tzinfo): |
57 |
def utcoffset(self, dt): |
|
58 |
return timedelta(0) |
|
59 |
|
|
60 |
def tzname(self, dt): |
|
61 |
return 'UTC' |
|
62 |
|
|
63 |
def dst(self, dt): |
|
64 |
return timedelta(0) |
|
56 |
def utcoffset(self, dt):
|
|
57 |
return timedelta(0)
|
|
58 |
|
|
59 |
def tzname(self, dt):
|
|
60 |
return 'UTC'
|
|
61 |
|
|
62 |
def dst(self, dt):
|
|
63 |
return timedelta(0)
|
|
65 | 64 |
|
66 | 65 |
def isoformat(d): |
67 |
"""Return an ISO8601 date string that includes a timezone.""" |
|
68 |
|
|
69 |
return d.replace(tzinfo=UTC()).isoformat() |
|
66 |
"""Return an ISO8601 date string that includes a timezone."""
|
|
67 |
|
|
68 |
return d.replace(tzinfo=UTC()).isoformat()
|
|
70 | 69 |
|
71 | 70 |
def epoch(datetime): |
72 | 71 |
return int(time.mktime(datetime.timetuple())*1000) |
73 | 72 |
|
74 |
def get_context(request, extra_context={}, **kwargs): |
|
75 |
if not extra_context: |
|
76 |
extra_context = {} |
|
73 |
def get_context(request, extra_context=None, **kwargs): |
|
74 |
extra_context = extra_context or {} |
|
77 | 75 |
extra_context.update(kwargs) |
78 | 76 |
return RequestContext(request, extra_context) |
79 | 77 |
|
... | ... | |
143 | 141 |
expires=expire_fmt, path='/', |
144 | 142 |
domain=COOKIE_DOMAIN, secure=COOKIE_SECURE) |
145 | 143 |
msg = 'Cookie [expiring %s] set for %s' % (user.auth_token_expires, user.email) |
146 |
logger._log(LOGGING_LEVEL, msg, [])
|
|
144 |
logger.log(LOGGING_LEVEL, msg)
|
|
147 | 145 |
|
148 | 146 |
class lazy_string(object): |
149 | 147 |
def __init__(self, function, *args, **kwargs): |
Also available in: Unified diff