openstack/placement
Code Issues Proposed changes

Merge "[Py34] Enable api.openstack.test_wsgi unit test"

Browse Source
This commit is contained in:
Jenkins 2015-12-18 06:39:14 +00:00 committed by Gerrit Code Review
commit 3fe4e17ab5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nova/utils.py
View File

@ -588,14 +588,17 @@ def xhtml_escape(value):
def utf8(value):
"""Try to turn a string into utf-8 if possible.
Code is directly from the utf8 function in
The original code was copied from the utf8 function in
http://github.com/facebook/tornado/blob/master/tornado/escape.py
"""
if isinstance(value, six.text_type):
return value.encode('utf-8')
assert isinstance(value, str)
return value
if value is None or isinstance(value, six.binary_type):
return value
if not isinstance(value, six.text_type):
value = six.text_type(value)
return value.encode('utf-8')
def check_isinstance(obj, cls):