From f627a979a5760d8f18ffd2ac7fb061f8e3ad3564 Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki Date: Thu, 6 Sep 2012 16:22:41 +0300 Subject: [PATCH] fix get_query utility in case of HEAD request --- snf-astakos-app/astakos/im/util.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/snf-astakos-app/astakos/im/util.py b/snf-astakos-app/astakos/im/util.py index 00b044e..dbc76c1 100644 --- a/snf-astakos-app/astakos/im/util.py +++ b/snf-astakos-app/astakos/im/util.py @@ -105,7 +105,7 @@ def prepare_response(request, user, next='', renew=False): or user has not a valid token. """ renew = renew or (not user.auth_token) - renew = renew or (user.auth_token_expires and user.auth_token_expires < datetime.datetime.now()) + renew = renew or (user.auth_token_expires < datetime.datetime.now()) if renew: user.renew_token() try: @@ -138,9 +138,13 @@ def set_cookie(response, user): expire_fmt = user.auth_token_expires.strftime('%a, %d-%b-%Y %H:%M:%S %Z') cookie_value = quote(user.email + '|' + user.auth_token) response.set_cookie(COOKIE_NAME, value=cookie_value, - expires=expire_fmt, path='/', - domain=COOKIE_DOMAIN, secure=COOKIE_SECURE) - msg = 'Cookie [expiring %s] set for %s' % (user.auth_token_expires, user.email) + expires=expire_fmt, path='/', + domain=COOKIE_DOMAIN, secure=COOKIE_SECURE + ) + msg = 'Cookie [expiring %s] set for %s' % ( + user.auth_token_expires, + user.email + ) logger.log(LOGGING_LEVEL, msg) class lazy_string(object): @@ -161,4 +165,7 @@ def reserved_email(email): return AstakosUser.objects.filter(email = email).count() != 0 def get_query(request): - return request.__getattribute__(request.method) \ No newline at end of file + try: + return request.__getattribute__(request.method) + except AttributeError: + return request.GET \ No newline at end of file -- 1.7.10.4