Merge "Converted application to use utcnow()"

This commit is contained in:
Jenkins 2014-12-11 14:04:33 +00:00 committed by Gerrit Code Review
commit 8a652f2411
6 changed files with 11 additions and 11 deletions

View File

@ -123,7 +123,7 @@ class SkeletonValidator(RequestValidator):
email = request._params["openid.sreg.email"]
full_name = request._params["openid.sreg.fullname"]
username = request._params["openid.sreg.nickname"]
last_login = datetime.now()
last_login = datetime.utcnow()
user = user_api.user_get_by_openid(openid)
user_dict = {"full_name": full_name,

View File

@ -48,7 +48,7 @@ class DBTokenStorage(storage.StorageBase):
access_token_values = {
"access_token": access_token,
"expires_in": expires_in,
"expires_at": datetime.datetime.now() + datetime.timedelta(
"expires_at": datetime.datetime.utcnow() + datetime.timedelta(
seconds=expires_in),
"user_id": user_id
}
@ -61,7 +61,7 @@ class DBTokenStorage(storage.StorageBase):
"refresh_token": refresh_token,
"user_id": user_id,
"expires_in": refresh_expires_in,
"expires_at": datetime.datetime.now() + datetime.timedelta(
"expires_at": datetime.datetime.utcnow() + datetime.timedelta(
seconds=refresh_expires_in),
}
@ -77,7 +77,7 @@ class DBTokenStorage(storage.StorageBase):
if not token_info:
return False
if datetime.datetime.now() > token_info.expires_at:
if datetime.datetime.utcnow() > token_info.expires_at:
token_api.access_token_delete(access_token)
return False
@ -92,7 +92,7 @@ class DBTokenStorage(storage.StorageBase):
if not refresh_token_entry:
return False
if datetime.datetime.now() > refresh_token_entry.expires_at:
if datetime.datetime.utcnow() > refresh_token_entry.expires_at:
auth_api.refresh_token_delete(refresh_token)
return False

View File

@ -24,7 +24,7 @@ class Token(object):
self.access_token = access_token
self.refresh_token = refresh_token
self.expires_in = expires_in
self.expires_at = datetime.datetime.now() + \
self.expires_at = datetime.datetime.utcnow() + \
datetime.timedelta(seconds=expires_in)
self.user_id = user_id
self.is_valid = is_valid
@ -59,7 +59,7 @@ class MemoryTokenStorage(storage.StorageBase):
if not token_entry:
return False
now = datetime.datetime.now()
now = datetime.datetime.utcnow()
if now > token_entry.expires_at:
token_entry.is_valid = False
return False

View File

@ -73,8 +73,8 @@ def access_token_get_count(**kwargs):
def access_token_create(values):
# Update the expires_at date.
values['created_at'] = datetime.datetime.now()
values['expires_at'] = datetime.datetime.now() + datetime.timedelta(
values['created_at'] = datetime.datetime.utcnow()
values['expires_at'] = datetime.datetime.utcnow() + datetime.timedelta(
seconds=values['expires_in'])
return api_base.entity_create(models.AccessToken, values)

View File

@ -179,7 +179,7 @@ class TokenTest(BaseDbTestCase):
"access_token": u'an_access_token',
"refresh_token": u'a_refresh_token',
"expires_in": 3600,
"expires_at": datetime.now(),
"expires_at": datetime.utcnow(),
"user_id": 1
}

View File

@ -28,7 +28,7 @@ def load():
"""Load a batch of useful data into the database that our tests can work
with.
"""
now = datetime.datetime.now()
now = datetime.datetime.utcnow()
expires_at = now + datetime.timedelta(seconds=3600)
expired_at = now + datetime.timedelta(seconds=-3600)