openstack/aodh
Code Issues Proposed changes

Merge "Use wsme ClientSideError to handle unicode string"

Browse Source
This commit is contained in:
Jenkins 2013-10-31 05:48:01 +00:00 committed by Gerrit Code Review
commit 190a02a5fd
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ceilometer/api/controllers/v2.py
View File

@ -68,13 +68,12 @@ state_kind_enum = wtypes.Enum(str, *state_kind)
operation_kind = wtypes.Enum(str, 'lt', 'le', 'eq', 'ne', 'ge', 'gt')
class EntityNotFound(Exception):
code = 404
class EntityNotFound(wsme.exc.ClientSideError):
def __init__(self, entity, id):
super(EntityNotFound, self).__init__(
_("%(entity)s %(id)s Not Found") % {'entity': entity,
'id': id})
'id': id},
status_code=404)
class BoundedInt(wtypes.UserType):
@ -278,12 +277,11 @@ class Query(_Base):
return converted_value
class ProjectNotAuthorized(Exception):
code = 401
class ProjectNotAuthorized(wsme.exc.ClientSideError):
def __init__(self, id):
super(ProjectNotAuthorized, self).__init__(
_("Not Authorized to access project %s") % id)
_("Not Authorized to access project %s") % id,
status_code=401)
def _get_auth_project(on_behalf_of=None):