diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-26 00:30:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-26 00:30:34 +0000 |
| commit | cf73eb0c499c6cc02e2bde63bbeb13d25239ddca (patch) | |
| tree | df55a0e3e0e1f7e7e4088bb8d6d22c53996011bf | |
| parent | 51191e5597211925a276062ff1d18f3d8a0f3295 (diff) | |
| parent | 5bb5e7a3503536c0439aa4e1948291648c2a0277 (diff) | |
| download | keystone-cf73eb0c499c6cc02e2bde63bbeb13d25239ddca.tar.gz keystone-cf73eb0c499c6cc02e2bde63bbeb13d25239ddca.tar.xz keystone-cf73eb0c499c6cc02e2bde63bbeb13d25239ddca.zip | |
Merge "Exception.message deprecated in py26 (bug 1070890)"
| -rw-r--r-- | keystone/identity/backends/sql.py | 2 | ||||
| -rw-r--r-- | keystone/service.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keystone/identity/backends/sql.py b/keystone/identity/backends/sql.py index 7a2abf59..69c6aab3 100644 --- a/keystone/identity/backends/sql.py +++ b/keystone/identity/backends/sql.py @@ -41,7 +41,7 @@ def handle_conflicts(type='object'): try: return method(*args, **kwargs) except sql.IntegrityError as e: - raise exception.Conflict(type=type, details=e.message) + raise exception.Conflict(type=type, details=str(e.orig)) return wrapper return decorator 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) |