diff options
Diffstat (limited to 'keystone/token')
| -rw-r--r-- | keystone/token/backends/kvs.py | 7 | ||||
| -rw-r--r-- | keystone/token/backends/sql.py | 6 | ||||
| -rw-r--r-- | keystone/token/core.py | 3 |
3 files changed, 8 insertions, 8 deletions
diff --git a/keystone/token/backends/kvs.py b/keystone/token/backends/kvs.py index a61be955..442bd4b8 100644 --- a/keystone/token/backends/kvs.py +++ b/keystone/token/backends/kvs.py @@ -15,10 +15,10 @@ # under the License. import copy -import datetime from keystone.common import kvs from keystone import exception +from keystone.openstack.common import timeutils from keystone import token @@ -29,8 +29,7 @@ class Token(kvs.Base, token.Driver): token = self.db.get('token-%s' % token_id) except exception.NotFound: raise exception.TokenNotFound(token_id=token_id) - if (token['expires'] is None - or token['expires'] > datetime.datetime.utcnow()): + if token['expires'] is None or token['expires'] > timeutils.utcnow(): return token else: raise exception.TokenNotFound(token_id=token_id) @@ -50,7 +49,7 @@ class Token(kvs.Base, token.Driver): def list_tokens(self, user_id): tokens = [] - now = datetime.datetime.utcnow() + now = timeutils.utcnow() for token, user_ref in self.db.items(): if not token.startswith('token-'): continue diff --git a/keystone/token/backends/sql.py b/keystone/token/backends/sql.py index 5ba5e3a9..59cc47ca 100644 --- a/keystone/token/backends/sql.py +++ b/keystone/token/backends/sql.py @@ -15,10 +15,10 @@ # under the License. import copy -import datetime from keystone.common import sql from keystone import exception +from keystone.openstack.common import timeutils from keystone import token @@ -50,7 +50,7 @@ class Token(sql.Base, token.Driver): def get_token(self, token_id): session = self.get_session() token_ref = session.query(TokenModel).filter_by(id=token_id).first() - now = datetime.datetime.utcnow() + now = timeutils.utcnow() if token_ref and (not token_ref.expires or now < token_ref.expires): return token_ref.to_dict() else: @@ -80,7 +80,7 @@ class Token(sql.Base, token.Driver): def list_tokens(self, user_id): session = self.get_session() tokens = [] - now = datetime.datetime.utcnow() + now = timeutils.utcnow() for token_ref in session.query(TokenModel)\ .filter(TokenModel.expires > now): token_ref_dict = token_ref.to_dict() diff --git a/keystone/token/core.py b/keystone/token/core.py index 0aa2ce41..aff59fba 100644 --- a/keystone/token/core.py +++ b/keystone/token/core.py @@ -21,6 +21,7 @@ import datetime from keystone.common import manager from keystone import config from keystone import exception +from keystone.openstack.common import timeutils CONF = config.CONF @@ -104,4 +105,4 @@ class Driver(object): """ expire_delta = datetime.timedelta(seconds=CONF.token.expiration) - return datetime.datetime.utcnow() + expire_delta + return timeutils.utcnow() + expire_delta |