From 94525e3401ad022c553a742096b7adfe80fce748 Mon Sep 17 00:00:00 2001 From: Dolph Mathews Date: Wed, 9 Jan 2013 12:59:43 -0600 Subject: [PATCH] Remove iso8601 dep in favor of openstack.common Change-Id: I83d5c8681cc3cde4889d74d50c0ffa58b96b2819 --- keystoneclient/middleware/auth_token.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py index dcfba1f40..eadd2bead 100644 --- a/keystoneclient/middleware/auth_token.py +++ b/keystoneclient/middleware/auth_token.py @@ -268,7 +268,6 @@ class AuthProtocol(object): # Token caching via memcache self._cache = None - self._iso8601 = None self._cache_initialized = False # cache already initialzied? # By default the token will be cached for 5 minutes self.token_cache_time = int(self._conf_get('token_cache_time')) @@ -290,10 +289,8 @@ class AuthProtocol(object): if memcache_servers: try: import memcache - import iso8601 self.LOG.info('Using Keystone memcache for caching token') self._cache = memcache.Client(memcache_servers) - self._iso8601 = iso8601 except ImportError as e: msg = 'disabled caching due to missing libraries %s' % (e) self.LOG.warn(msg) @@ -691,7 +688,7 @@ class AuthProtocol(object): key = 'tokens/%s' % token if 'token' in data.get('access', {}): timestamp = data['access']['token']['expires'] - expires = self._iso8601.parse_date(timestamp).strftime('%s') + expires = timeutils.parse_isotime(timestamp).strftime('%s') else: self.LOG.error('invalid token format') return