openstack
/
designate
Code Issues Proposed changes

Merge "Make exception catching more python3-ish"

This commit is contained in:
Jenkins 2017-01-19 13:25:50 +00:00 committed by Gerrit Code Review
parent 184544ec6c 03069bfa5d
commit 6323afd556
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
designate/api/v2/controllers/floatingips.py
View File

@ -68,7 +68,7 @@ class FloatingIPController(rest.RestController):
try:
body = request.body_dict
except Exception as e:
if e.message != 'TODO: Unsupported Content Type':
if str(e) != 'TODO: Unsupported Content Type':
raise
else:
# Got a blank body

4
designate/backend/agent_backend/impl_gdnsd.py
View File

@ -72,8 +72,8 @@ def filter_exceptions(fn):
except exceptions.Backend as e:
raise e
except Exception as e:
LOG.error(_LE("Unhandled exception %s"), e.message, exc_info=True)
raise exceptions.Backend(e.message)
LOG.error(_LE("Unhandled exception %s"), e, exc_info=True)
raise exceptions.Backend(e)
return wrapper