openstack
/
heat
Code Issues Proposed changes

Convert parse error to text type 

Some local environments (but not yet the gate) are experiencing
failure of InstantiationDataTest.test_format_parse_invalid_message.

This change fixes that test by converting the parse exception to
a text type before including it in the error message.

Change-Id: I06e271559e27452a7a0c1e8807a37bb5ed5df2fa
Closes-Bug: #1365880
This commit is contained in:
Steve Baker 2014-09-24 10:43:44 +12:00
parent 689ea2742e
commit 58a094238b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat/api/openstack/v1/stacks.py
View File

@ -15,6 +15,7 @@
Stack endpoint for Heat v1 ReST API.
"""
import six
from six.moves.urllib import parse
from webob import exc
@ -79,7 +80,7 @@ class InstantiationData(object):
else:
return template_format.parse(data)
except ValueError as parse_ex:
mdict = {'type': data_type, 'error': parse_ex}
mdict = {'type': data_type, 'error': six.text_type(parse_ex)}
msg = _("%(type)s not in valid format: %(error)s") % mdict
raise exc.HTTPBadRequest(msg)