diff --git a/tuskar/api/controllers/v1/node.py b/tuskar/api/controllers/v1/node.py index 87026657..cdae56e8 100644 --- a/tuskar/api/controllers/v1/node.py +++ b/tuskar/api/controllers/v1/node.py @@ -33,7 +33,7 @@ class NodesController(rest.RestController): try: node = db_api.get_node(node_id) - except exception.TuskarException, e: + except exception.TuskarException as e: response = api.Response(None, error=Error(faultcode=e.code, faultstring=str(e)), diff --git a/tuskar/api/controllers/v1/rack.py b/tuskar/api/controllers/v1/rack.py index cbe420a0..1601b29a 100644 --- a/tuskar/api/controllers/v1/rack.py +++ b/tuskar/api/controllers/v1/rack.py @@ -89,7 +89,7 @@ class RacksController(rest.RestController): db_api = pecan.request.dbapi try: rack = db_api.get_rack(rack_id) - except exception.TuskarException, e: + except exception.TuskarException as e: response = api.Response( None, error=Error(faultcode=e.code, faultstring=str(e)), @@ -115,7 +115,7 @@ class RacksController(rest.RestController): # # TODO(mfojtik): Update the HEAT template at this point # - except exception.TuskarException, e: + except exception.TuskarException as e: response = api.Response( Error(faultcode=e.code, faultstring=str(e)), status_code=e.code) diff --git a/tuskar/common/exception.py b/tuskar/common/exception.py index e2865d09..3baa6e90 100644 --- a/tuskar/common/exception.py +++ b/tuskar/common/exception.py @@ -81,7 +81,7 @@ def wrap_exception(notifier=None, publisher_id=None, event_type=None, # contain confidential information. try: return f(self, context, *args, **kw) - except Exception, e: + except Exception as e: with excutils.save_and_reraise_exception(): if notifier: payload = dict(exception=e)