diff --git a/glance/api/v2/image_data.py b/glance/api/v2/image_data.py index be21bfc54a..4c7a9c702a 100644 --- a/glance/api/v2/image_data.py +++ b/glance/api/v2/image_data.py @@ -115,14 +115,14 @@ class ImageDataController(object): try: image_repo.save(image, from_state='saving') - except exception.NotAuthenticated as e: + except exception.NotAuthenticated: if refresher is not None: # request a new token to update an image in database cxt.auth_token = refresher.refresh_token() image_repo = self.gateway.get_repo(req.context) image_repo.save(image, from_state='saving') else: - raise e + raise try: # release resources required for re-auth diff --git a/glance/db/sqlalchemy/metadef_api/namespace.py b/glance/db/sqlalchemy/metadef_api/namespace.py index 9a03c82399..18a246439e 100644 --- a/glance/db/sqlalchemy/metadef_api/namespace.py +++ b/glance/db/sqlalchemy/metadef_api/namespace.py @@ -268,7 +268,7 @@ def delete(context, name, session): raise exc.MetadefIntegrityError( record_type='namespace', record_name=name) else: - raise e + raise return namespace_rec.to_dict() @@ -296,6 +296,6 @@ def delete_cascade(context, name, session): raise exc.MetadefIntegrityError( record_type='namespace', record_name=name) else: - raise e + raise return namespace_rec.to_dict() diff --git a/glance/db/sqlalchemy/metadef_api/resource_type.py b/glance/db/sqlalchemy/metadef_api/resource_type.py index 2ee19b612a..2b970e3cd1 100644 --- a/glance/db/sqlalchemy/metadef_api/resource_type.py +++ b/glance/db/sqlalchemy/metadef_api/resource_type.py @@ -102,6 +102,6 @@ def delete(context, name, session): raise exc.MetadefIntegrityError( record_type='resource-type', record_name=name) else: - raise e + raise return db_rec.to_dict()