summaryrefslogtreecommitdiffstats
path: root/keystone/service.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-10-26 00:30:34 +0000
committerGerrit Code Review <review@openstack.org>2012-10-26 00:30:34 +0000
commitcf73eb0c499c6cc02e2bde63bbeb13d25239ddca (patch)
treedf55a0e3e0e1f7e7e4088bb8d6d22c53996011bf /keystone/service.py
parent51191e5597211925a276062ff1d18f3d8a0f3295 (diff)
parent5bb5e7a3503536c0439aa4e1948291648c2a0277 (diff)
downloadkeystone-cf73eb0c499c6cc02e2bde63bbeb13d25239ddca.tar.gz
keystone-cf73eb0c499c6cc02e2bde63bbeb13d25239ddca.tar.xz
keystone-cf73eb0c499c6cc02e2bde63bbeb13d25239ddca.zip
Merge "Exception.message deprecated in py26 (bug 1070890)"
Diffstat (limited to 'keystone/service.py')
-rw-r--r--keystone/service.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystone/service.py b/keystone/service.py
index c5fe9633..4cc4ad26 100644
--- a/keystone/service.py
+++ b/keystone/service.py
@@ -340,7 +340,7 @@ class TokenController(wsgi.Application):
LOG.warning('Tenant %s is disabled' % tenant_id)
raise exception.Unauthorized()
except AssertionError as e:
- raise exception.Unauthorized(e.message)
+ raise exception.Unauthorized(str(e))
auth_token_data = dict(zip(['user', 'tenant', 'metadata'],
auth_info))
expiry = self.token_api._get_default_expire_time(context=context)